X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fxmlrpcapi.py;h=54fb745e32dfa47846b807eff686038e84413e1e;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=b4fa748f78cc8949e59026adce86450f30560a25;hpb=0a9902d2a55a0a9ac03601345c4284293669012b;p=sfa.git

diff --git a/sfa/server/xmlrpcapi.py b/sfa/server/xmlrpcapi.py
index b4fa748f..54fb745e 100644
--- a/sfa/server/xmlrpcapi.py
+++ b/sfa/server/xmlrpcapi.py
@@ -2,7 +2,7 @@
 # SFA XML-RPC and SOAP interfaces
 #
 
-import string
+from importlib import import_module
 
 # SOAP support is optional
 try:
@@ -15,7 +15,6 @@ except ImportError:
     SOAPpy = None
 
 ####################
-#from sfa.util.faults import SfaNotImplemented, SfaAPIError, SfaInvalidAPIMethod, SfaFault
 from sfa.util.faults import SfaInvalidAPIMethod, SfaAPIError, SfaFault
 from sfa.util.sfalogging import logger
 from sfa.util.py23 import xmlrpc_client
@@ -27,12 +26,20 @@ from sfa.util.py23 import xmlrpc_client
 # avoiding
 # [#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF]
 
-invalid_xml_ascii = map(chr, range(0x0, 0x8) + [0xB, 0xC] + range(0xE, 0x1F))
-xml_escape_table = string.maketrans(
-    "".join(invalid_xml_ascii), "?" * len(invalid_xml_ascii))
+invalid_codepoints = list(range(0x0, 0x8)) + [0xB, 0xC] + list(range(0xE, 0x1F))
+# broke with f24, somehow we get a unicode
+# as an incoming string to be translated
+str_xml_escape_table = \
+    str.maketrans("".join((chr(x) for x in invalid_codepoints)),
+                  "?" * len(invalid_codepoints))
+# loosely inspired from
+# http://stackoverflow.com/questions/1324067/
+# how-do-i-get-str-translate-to-work-with-unicode-strings
+unicode_xml_escape_table = \
+    {invalid: "?" for invalid in invalid_codepoints}
 
 
-def xmlrpclib_escape(s, replace=string.replace):
+def xmlrpclib_escape(s, replace=str.replace):
     """
     xmlrpclib does not handle invalid 7-bit control characters. This
     function augments xmlrpclib.escape, which by default only replaces
@@ -45,7 +52,10 @@ def xmlrpclib_escape(s, replace=string.replace):
     s = replace(s, ">", ">",)
 
     # Replace invalid 7-bit control characters with '?'
-    return s.translate(xml_escape_table)
+    if isinstance(s, str):
+        return s.translate(str_xml_escape_table)
+    else:
+        return s.translate(unicode_xml_escape_table)
 
 
 def xmlrpclib_dump(self, value, write):
@@ -61,16 +71,15 @@ def xmlrpclib_dump(self, value, write):
 
     # Use our escape function
     args = [self, value, write]
-    if isinstance(value, (str, unicode)):
+    if isinstance(value, str):
         args.append(xmlrpclib_escape)
 
     try:
         # Try for an exact match first
         f = self.dispatch[type(value)]
     except KeyError:
-        raise
         # Try for an isinstance() match
-        for Type, f in self.dispatch.iteritems():
+        for Type, f in self.dispatch.items():
             if isinstance(value, Type):
                 f(*args)
                 return
@@ -78,6 +87,7 @@ def xmlrpclib_dump(self, value, write):
     else:
         f(*args)
 
+
 # You can't hide from me!
 # Note: not quite  sure if this will still cause
 # the expected behaviour under python3
@@ -86,7 +96,7 @@ xmlrpc_client.Marshaller._Marshaller__dump = xmlrpclib_dump
 
 class XmlrpcApi:
     """
-    The XmlrpcApi class implements a basic xmlrpc (or soap) service 
+    The XmlrpcApi class implements a basic xmlrpc (or soap) service
     """
 
     protocol = None
@@ -97,12 +107,9 @@ class XmlrpcApi:
         self.source = None
 
         # flat list of method names
-        self.methods_module = methods_module = __import__(
-            methods, fromlist=[methods])
+        self.methods_module = methods_module = import_module(methods)
         self.methods = methods_module.all
 
-        self.logger = logger
-
     def callable(self, method):
         """
         Return a new instance of the specified method.
@@ -114,12 +121,12 @@ class XmlrpcApi:
         # Get new instance of method
         try:
             classname = method.split(".")[-1]
-            module = __import__(self.methods_module.__name__ +
-                                "." + method, globals(), locals(), [classname])
+            module = import_module(
+                self.methods_module.__name__ + "." + method)
             callablemethod = getattr(module, classname)(self)
             return getattr(module, classname)(self)
         except (ImportError, AttributeError):
-            self.logger.log_exc("Error importing method: %s" % method)
+            logger.log_exc("Error importing method: %s" % method)
             raise SfaInvalidAPIMethod(method)
 
     def call(self, source, method, *args):
@@ -161,9 +168,9 @@ class XmlrpcApi:
             result = self.call(source, method, *args)
         except SfaFault as fault:
             result = fault
-            self.logger.log_exc("XmlrpcApi.handle has caught Exception")
+            logger.log_exc("XmlrpcApi.handle has caught Exception")
         except Exception as fault:
-            self.logger.log_exc("XmlrpcApi.handle has caught Exception")
+            logger.log_exc("XmlrpcApi.handle has caught Exception")
             result = SfaAPIError(fault)
 
         # Return result