Python 3 preparation: update xmlrpclib / SimpleXMLRPCServer imports.

New roundup/anypy/xmlrpc_.py added.  Manual patch.

Author: jsm28

roundup/anypy/xmlrpc_.py

@@ -0,0 +1,7 @@
+try:
+    # Python 3+.
+    from xmlrpc import client, server
+except ImportError:
+    # Python 2.
+    import xmlrpclib as client
+    import SimpleXMLRPCServer as server

roundup/cgi/client.py

@@ -42,12 +42,12 @@
     get_cookie_date
 from roundup.anypy import http_
 from roundup.anypy import urllib_
+from roundup.anypy import xmlrpc_
 
 from email.MIMEBase import MIMEBase
 from email.MIMEText import MIMEText
 from email.MIMEMultipart import MIMEMultipart
 import roundup.anypy.email_
-import xmlrpclib
 
 def initialiseSecurity(security):
     '''Create some Permissions and Roles on the security object
@@ -466,8 +466,8 @@ def handle_xmlrpc(self):
         except (Unauthorised, UsageError) as msg:
             # report exception back to server
             exc_type, exc_value, exc_tb = sys.exc_info()
-            output = xmlrpclib.dumps(
-                xmlrpclib.Fault(1, "%s:%s" % (exc_type, exc_value)),
+            output = xmlrpc_.client.dumps(
+                xmlrpc_.client.Fault(1, "%s:%s" % (exc_type, exc_value)),
                 allow_none=True)
             csrf_ok = False # we had an error, failed check
 

roundup/scripts/roundup_xmlrpc_server.py

@@ -27,8 +27,9 @@
 import roundup.instance
 from roundup.instance import TrackerError
 from roundup.cgi.exceptions import Unauthorised
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from roundup.anypy import xmlrpc_
+SimpleXMLRPCServer = xmlrpc_.server.SimpleXMLRPCServer
+SimpleXMLRPCRequestHandler = xmlrpc_.server.SimpleXMLRPCRequestHandler
 
 
 class RequestHandler(SimpleXMLRPCRequestHandler):

roundup/xmlrpc.py

@@ -9,8 +9,9 @@
 from roundup.exceptions import Unauthorised, UsageError
 from roundup.date import Date, Range, Interval
 from roundup import actions
-from SimpleXMLRPCServer import SimpleXMLRPCDispatcher
-from xmlrpclib import Binary
+from roundup.anypy import xmlrpc_
+SimpleXMLRPCDispatcher = xmlrpc_.server.SimpleXMLRPCDispatcher
+Binary = xmlrpc_.client.Binary
 from traceback import format_exc
 
 def translate(value):

scripts/schema-dump.py

@@ -18,7 +18,7 @@
 
 import os
 import sys
-import xmlrpclib
+from roundup.anypy import xmlrpc_
 import pprint
 import textwrap
 from optparse import OptionParser
@@ -92,7 +92,7 @@ def format_yaml(var):
     (options, args) = parser.parse_args()
 
     url = args[0]
-    roundup_server = xmlrpclib.ServerProxy(url, allow_none=True)
+    roundup_server = xmlrpc_.client.ServerProxy(url, allow_none=True)
     schema = roundup_server.schema()
     if options.raw:
         print(str(schema))

share/roundup/templates/devel/extensions/spambayes.py

@@ -1,8 +1,9 @@
 import re, math
 from roundup.cgi.actions import Action
 from roundup.cgi.exceptions import *
+from roundup.anypy import xmlrpc_
 
-import xmlrpclib, socket
+import socket
 
 REVPAT = re.compile(r'(r[0-9]+\b|rev(ision)? [0-9]+\b)')
 
@@ -26,11 +27,11 @@ def extract_classinfo(db, classname, nodeid):
 def train_spambayes(db, content, tokens, is_spam):
     spambayes_uri = db.config.detectors['SPAMBAYES_URI']
 
-    server = xmlrpclib.ServerProxy(spambayes_uri, verbose=False)
+    server = xmlrpc_.client.ServerProxy(spambayes_uri, verbose=False)
     try:
         server.train({'content':content}, tokens, {}, is_spam)
         return (True, None)
-    except (socket.error, xmlrpclib.Error) as e:
+    except (socket.error, xmlrpc_.client.Error) as e:
         return (False, str(e))
 
 

share/roundup/templates/responsive/extensions/spambayes.py

@@ -1,8 +1,9 @@
 import re, math
 from roundup.cgi.actions import Action
 from roundup.cgi.exceptions import *
+from roundup.anypy import xmlrpc_
 
-import xmlrpclib, socket
+import socket
 
 REVPAT = re.compile(r'(r[0-9]+\b|rev(ision)? [0-9]+\b)')
 
@@ -26,11 +27,11 @@ def extract_classinfo(db, classname, nodeid):
 def train_spambayes(db, content, tokens, is_spam):
     spambayes_uri = db.config.detectors['SPAMBAYES_URI']
 
-    server = xmlrpclib.ServerProxy(spambayes_uri, verbose=False)
+    server = xmlrpc_.client.ServerProxy(spambayes_uri, verbose=False)
     try:
         server.train({'content':content}, tokens, {}, is_spam)
         return (True, None)
-    except (socket.error, xmlrpclib.Error) as e:
+    except (socket.error, xmlrpc_.client.Error) as e:
         return (False, str(e))
 
 

test/test_xmlrpc.py

@@ -7,7 +7,8 @@
 from __future__ import print_function
 import unittest, os, shutil, errno, sys, difflib, cgi, re
 
-from xmlrpclib import MultiCall
+from roundup.anypy import xmlrpc_
+MultiCall = xmlrpc_.client.MultiCall
 from roundup.cgi.exceptions import *
 from roundup import init, instance, password, hyperdb, date
 from roundup.xmlrpc import RoundupInstance, RoundupDispatcher

website/issues/extensions/spambayes.py

@@ -1,8 +1,9 @@
 import re, math
 from roundup.cgi.actions import Action
 from roundup.cgi.exceptions import *
+from roundup.anypy import xmlrpc_
 
-import xmlrpclib, socket
+import socket
 
 REVPAT = re.compile(r'(r[0-9]+\b|rev(ision)? [0-9]+\b)')
 
@@ -26,11 +27,11 @@ def extract_classinfo(db, classname, nodeid):
 def train_spambayes(db, content, tokens, is_spam):
     spambayes_uri = db.config.detectors['SPAMBAYES_URI']
 
-    server = xmlrpclib.ServerProxy(spambayes_uri, verbose=False)
+    server = xmlrpc_.client.ServerProxy(spambayes_uri, verbose=False)
     try:
         server.train({'content':content}, tokens, {}, is_spam)
         return (True, None)
-    except (socket.error, xmlrpclib.Error) as e:
+    except (socket.error, xmlrpc_.client.Error) as e:
         return (False, str(e))