X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=plugins%2Fproxy.py;fp=plugins%2Fproxy.py;h=60ea89967572e14c1bcca597d2605266200b4fc7;hp=51364cb31998727db91539766f5d82a429b09c61;hb=6e44dc1ff5905ac59fe6428c5ea17cd3d179407b;hpb=e00a8f0217a79d25b655223c17cc2d4752c816a4

diff --git a/plugins/proxy.py b/plugins/proxy.py
index 51364cb31..60ea89967 100755
--- a/plugins/proxy.py
+++ b/plugins/proxy.py
@@ -43,7 +43,10 @@ try:  # Python 3
     import xmlrpc.client as _xmlrpc_client
 except ImportError:  # Python 2
     import xmlrpclib as _xmlrpc_client
-from SimpleXMLRPCServer import SimpleXMLRPCDispatcher
+try:  # Python 3
+    import xmlrpc.server as _xmlrpc_server
+except ImportError:  # Python 2
+    import SimpleXMLRPCServer as _xmlrpc_server
 
 
 class ParseError (Exception):
@@ -66,15 +69,16 @@ class AlreadyImported (Exception):
     pass
 
 
-class _IkiWikiExtPluginXMLRPCDispatcher(SimpleXMLRPCDispatcher):
+class _IkiWikiExtPluginXMLRPCDispatcher(_xmlrpc_server.SimpleXMLRPCDispatcher):
 
     def __init__(self, allow_none=False, encoding=None):
         try:
-            SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
+            _xmlrpc_server.SimpleXMLRPCDispatcher.__init__(
+                self, allow_none, encoding)
         except TypeError:
             # see http://bugs.debian.org/470645
             # python2.4 and before only took one argument
-            SimpleXMLRPCDispatcher.__init__(self)
+            _xmlrpc_server.SimpleXMLRPCDispatcher.__init__(self)
 
     def dispatch(self, method, params):
         return self._dispatch(method, params)