changed str calls to unicode, changed a var from str to s

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8233 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/python/oils/utils/csedit.py b/Open-ILS/src/python/oils/utils/csedit.py
index 281cb47..a813b00 100644 (file)
--- a/Open-ILS/src/python/oils/utils/csedit.py
+++ b/Open-ILS/src/python/oils/utils/csedit.py
@@ -105,7 +105,7 @@ class CSEditor(object):
 
         # XXX improve param logging here
 
-        self.log(log_info, "request %s %s" % (method, str(params)))
+        self.log(osrfLogInfo, "request %s %s" % (method, unicode(params)))
 
         if self.xact and self.session().state != OSRF_APP_SESSION_CONNECTED:
             self.log(log_error, "csedit lost its connection!")
@@ -118,7 +118,7 @@ class CSEditor(object):
             val = resp.content()
 
         except Exception, e:
-            self.log(log_error, "request error: %s" % str(e))
+            self.log(osrfLogErr, "request error: %s" % unicode(e))
             raise e
 
         return val
@@ -158,7 +158,7 @@ class CSEditor(object):
 
     def rawSearch(self, args):
         method = "%s.json_query.atomic" % self.app
-        self.log(log_debug, "rawSearch args: %s" % str(args))
+        self.log(osrfLogDebug, "rawSearch args: %s" % unicode(args))
         return self.request(method, [args])
 
     def rawSearch2(self, hint, fields, where, from_=None):
@@ -191,9 +191,9 @@ def oilsLoadCSEditor():
             type = fm['fieldmapper'].replace('::', '.')
             name = "%s_%s" % (action, fmname)
 
-            str = 'def %s(self, arg, **options):\n' % name
-            str += '\treturn self.runMethod("%s", "%s", arg, dict(options))\n' % (action, type)
-            str += 'setattr(CSEditor, "%s", %s)' % (name, name)
+            s = 'def %s(self, arg, **options):\n' % name
+            s += '\treturn self.runMethod("%s", "%s", arg, dict(options))\n' % (action, type)
+            s += 'setattr(CSEditor, "%s", %s)' % (name, name)
 
-            exec(str)
+            exec(s)