[open-ils-commits] r8390 - in branches/acq-experiment/Open-ILS/src/python/oils: . utils

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-01-15 22:44:40 -0500 (Tue, 15 Jan 2008)
New Revision: 8390

Modified:
   branches/acq-experiment/Open-ILS/src/python/oils/system.py
   branches/acq-experiment/Open-ILS/src/python/oils/utils/utils.py
Log:
forward-porting updates to match osrf api

Modified: branches/acq-experiment/Open-ILS/src/python/oils/system.py
===================================================================
--- branches/acq-experiment/Open-ILS/src/python/oils/system.py	2008-01-16 03:37:47 UTC (rev 8389)
+++ branches/acq-experiment/Open-ILS/src/python/oils/system.py	2008-01-16 03:44:40 UTC (rev 8390)
@@ -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()

Modified: branches/acq-experiment/Open-ILS/src/python/oils/utils/utils.py
===================================================================
--- branches/acq-experiment/Open-ILS/src/python/oils/utils/utils.py	2008-01-16 03:37:47 UTC (rev 8389)
+++ branches/acq-experiment/Open-ILS/src/python/oils/utils/utils.py	2008-01-16 03:44:40 UTC (rev 8390)
@@ -14,7 +14,7 @@
 # -----------------------------------------------------------------------
 
 import re, md5
-from osrf.ses import AtomicRequest
+import osrf.ses
 from osrf.log import *
 
 
@@ -61,14 +61,14 @@
 
     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,