remove py23 compat layer

[sfa.git] / sfa / server / xmlrpcapi.py

diff --git a/sfa/server/xmlrpcapi.py b/sfa/server/xmlrpcapi.py
index f3d4e68..d89021d 100644 (file)
--- 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:
@@ -17,7 +17,7 @@ except ImportError:
 ####################
 from sfa.util.faults import SfaInvalidAPIMethod, SfaAPIError, SfaFault
 from sfa.util.sfalogging import logger
-from sfa.util.py23 import xmlrpc_client
+import xmlrpc.client
 
 ####################
 # See "2.2 Characters" in the XML specification:
@@ -26,15 +26,20 @@ from sfa.util.py23 import xmlrpc_client
 # avoiding
 # [#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF]
 
-invalid_codepoints = range(0x0, 0x8) + [0xB, 0xC] + range(0xE, 0x1F)
-# broke with f24, somehow we get a unicode as an incoming string to be translated
-str_xml_escape_table = string.maketrans("".join((chr(x) for x in invalid_codepoints)),
-                                        "?" * len(invalid_codepoints))
+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 : u"?" for invalid in invalid_codepoints}
+# 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
@@ -66,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
@@ -83,10 +87,11 @@ 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
-xmlrpc_client.Marshaller._Marshaller__dump = xmlrpclib_dump
+xmlrpc.client.Marshaller._Marshaller__dump = xmlrpclib_dump
 
 
 class XmlrpcApi:
@@ -102,8 +107,7 @@ 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
 
     def callable(self, method):
@@ -117,8 +121,8 @@ 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):
@@ -141,9 +145,9 @@ class XmlrpcApi:
         """
         # Parse request into method name and arguments
         try:
-            interface = xmlrpc_client
+            interface = xmlrpc.client
             self.protocol = 'xmlrpc'
-            (args, method) = xmlrpc_client.loads(data)
+            (args, method) = xmlrpc.client.loads(data)
             if method in method_map:
                 method = method_map[method]
             methodresponse = True
@@ -181,7 +185,7 @@ class XmlrpcApi:
         if self.protocol == 'xmlrpc':
             if not isinstance(result, SfaFault):
                 result = (result,)
-            response = xmlrpc_client.dumps(
+            response = xmlrpc.client.dumps(
                 result, methodresponse=True, encoding=self.encoding, allow_none=1)
         elif self.protocol == 'soap':
             if isinstance(result, Exception):