diff roundup/scripts/roundup_server.py @ 5410:d0816d50ee8f

Python 3 preparation: update SocketServer import. Manual patch.
author Joseph Myers <jsm@polyomino.org.uk>
date Wed, 25 Jul 2018 00:17:56 +0000
parents 277e91bf7936
children 55f09ca366c4
line wrap: on
line diff
--- a/roundup/scripts/roundup_server.py	Wed Jul 25 00:17:07 2018 +0000
+++ b/roundup/scripts/roundup_server.py	Wed Jul 25 00:17:56 2018 +0000
@@ -37,7 +37,14 @@
 
 
 import errno, cgi, getopt, os, socket, sys, traceback, time
-import SocketServer, StringIO
+import StringIO
+
+try:
+    # Python 3.
+    import socketserver
+except ImportError:
+    # Python 2.
+    import SocketServer as socketserver
 
 try:
     # Python 2.
@@ -711,12 +718,12 @@
             self["MULTIPROCESS"] = "none"
             server_class = base_server
         elif self["MULTIPROCESS"] == "fork":
-            class ForkingServer(SocketServer.ForkingMixIn,
+            class ForkingServer(socketserver.ForkingMixIn,
                 base_server):
                     pass
             server_class = ForkingServer
         elif self["MULTIPROCESS"] == "thread":
-            class ThreadingServer(SocketServer.ThreadingMixIn,
+            class ThreadingServer(socketserver.ThreadingMixIn,
                 base_server):
                     pass
             server_class = ThreadingServer

Roundup Issue Tracker: http://roundup-tracker.org/