Skip to content

Commit 1761410

Browse files
committed
Python 3 preparation: update SocketServer import.
Manual patch.
1 parent 3bfbaf0 commit 1761410

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

roundup/scripts/roundup_server.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,14 @@
3737

3838

3939
import errno, cgi, getopt, os, socket, sys, traceback, time
40-
import SocketServer, StringIO
40+
import StringIO
41+
42+
try:
43+
# Python 3.
44+
import socketserver
45+
except ImportError:
46+
# Python 2.
47+
import SocketServer as socketserver
4148

4249
try:
4350
# Python 2.
@@ -711,12 +718,12 @@ def finish(self):
711718
self["MULTIPROCESS"] = "none"
712719
server_class = base_server
713720
elif self["MULTIPROCESS"] == "fork":
714-
class ForkingServer(SocketServer.ForkingMixIn,
721+
class ForkingServer(socketserver.ForkingMixIn,
715722
base_server):
716723
pass
717724
server_class = ForkingServer
718725
elif self["MULTIPROCESS"] == "thread":
719-
class ThreadingServer(SocketServer.ThreadingMixIn,
726+
class ThreadingServer(socketserver.ThreadingMixIn,
720727
base_server):
721728
pass
722729
server_class = ThreadingServer

0 commit comments

Comments
 (0)