WIP

src/ZServer/ZPublisher/tests/test_xmlrpc.py

@@ -1,8 +1,8 @@
-import unittest
-import xmlrpclib
-
 from DateTime import DateTime
 
+import unittest
+import xmlrpc.client as xmlrpclib
+
 
 class FauxResponse(object):
 

src/ZServer/ZPublisher/xmlrpc.py

@@ -19,18 +19,19 @@
 information about XML-RPC and Zope.
 """
 
+from App.config import getConfiguration
+# Make DateTime.DateTime marshallable via XML-RPC
+# http://www.zope.org/Collectors/Zope/2109
+from DateTime.DateTime import DateTime
+from zExceptions import Unauthorized
+from ZODB.POSException import ConflictError
+
 import re
 import sys
 import types
-import xmlrpclib
+import xmlrpc.client as xmlrpclib
 
-from App.config import getConfiguration
-from zExceptions import Unauthorized
-from ZODB.POSException import ConflictError
 
-# Make DateTime.DateTime marshallable via XML-RPC
-# http://www.zope.org/Collectors/Zope/2109
-from DateTime.DateTime import DateTime
 WRAPPERS = xmlrpclib.WRAPPERS + (DateTime, )
 
 
@@ -50,7 +51,7 @@ def dump_instance(self, value, write):
         self.dump_struct(value, write)
 
 
-xmlrpclib.Marshaller.dispatch[types.InstanceType] = dump_instance
+xmlrpclib.Marshaller.dispatch[object] = dump_instance
 xmlrpclib.Marshaller.dispatch[DateTime] = dump_instance
 
 

src/ZServer/utils.py

@@ -13,9 +13,9 @@
 
 """ A set of utility routines used by asyncore initialization """
 
+import pkg_resources
 import sys
 
-import pkg_resources
 
 _version_string = None
 
@@ -71,6 +71,6 @@ def requestCloseOnExec(sock):
 
 
 def patchSyslogServiceName():
-    from medusa import logger
+    from .medusa import logger
     # override the service name in logger.syslog_logger
     logger.syslog_logger.svc_name = 'ZServer'