forward-porting updates to match osrf api

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8390 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/python/oils/system.py b/Open-ILS/src/python/oils/system.py
index 5124f05..e4b0a3d 100644 (file)
--- a/Open-ILS/src/python/oils/system.py
+++ b/Open-ILS/src/python/oils/system.py
@@ -14,13 +14,14 @@
 # -----------------------------------------------------------------------
 
 import osrf.log
-from osrf.system import connect
+import osrf.system
 from oils.utils.idl import IDLParser
 from oils.utils.csedit import oilsLoadCSEditor
 
-def oilsConnect(config, configContext):
-       """Connects to the opensrf network,  parses the IDL file, and loads the CSEditor"""
-       osrf.log.log_info("oilsConnect(): connecting with config %s" % config)
-       connect(config, configContext)
-       IDLParser.parse()
-       oilsLoadCSEditor()
+class System(object):
+    @staticmethod
+    def connect(**kwargs):
+           """Connects to the opensrf network,  parses the IDL file, and loads the CSEditor"""
+           osrf.system.System.connect(**kwargs)
+           IDLParser.parse()
+           oilsLoadCSEditor()

diff --git a/Open-ILS/src/python/oils/utils/utils.py b/Open-ILS/src/python/oils/utils/utils.py
index 47c939e..1941a85 100644 (file)
--- a/Open-ILS/src/python/oils/utils/utils.py
+++ b/Open-ILS/src/python/oils/utils/utils.py
@@ -14,7 +14,7 @@
 # -----------------------------------------------------------------------
 
 import re, md5
-from osrf.ses import AtomicRequest
+import osrf.ses
 from osrf.log import *
 
 
@@ -61,14 +61,14 @@ def login(username, password, type=None, workstation=None):
 
     log_info("attempting login with user " + username)
 
-    seed = AtomicRequest(
+    seed = osrf.ses.ClientSession.atomic_request(
         'open-ils.auth', 
         'open-ils.auth.authenticate.init', username)
 
     # generate the hashed password
     password = md5sum(seed + md5sum(password))
 
-    return AtomicRequest(
+    return osrf.ses.ClientSession.atomic_request(
         'open-ils.auth',
         'open-ils.auth.authenticate.complete',
         {   'workstation' : workstation,