Mercurial > p > roundup > code
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5409:277e91bf7936 | 5410:d0816d50ee8f |
|---|---|
| 35 sys.path.insert(0, rootdir) | 35 sys.path.insert(0, rootdir) |
| 36 # --/ | 36 # --/ |
| 37 | 37 |
| 38 | 38 |
| 39 import errno, cgi, getopt, os, socket, sys, traceback, time | 39 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 | |
| 41 | 48 |
| 42 try: | 49 try: |
| 43 # Python 2. | 50 # Python 2. |
| 44 reload | 51 reload |
| 45 except NameError: | 52 except NameError: |
| 709 print(_("Multiprocess mode \"%s\" is not available, " | 716 print(_("Multiprocess mode \"%s\" is not available, " |
| 710 "switching to single-process") % self["MULTIPROCESS"]) | 717 "switching to single-process") % self["MULTIPROCESS"]) |
| 711 self["MULTIPROCESS"] = "none" | 718 self["MULTIPROCESS"] = "none" |
| 712 server_class = base_server | 719 server_class = base_server |
| 713 elif self["MULTIPROCESS"] == "fork": | 720 elif self["MULTIPROCESS"] == "fork": |
| 714 class ForkingServer(SocketServer.ForkingMixIn, | 721 class ForkingServer(socketserver.ForkingMixIn, |
| 715 base_server): | 722 base_server): |
| 716 pass | 723 pass |
| 717 server_class = ForkingServer | 724 server_class = ForkingServer |
| 718 elif self["MULTIPROCESS"] == "thread": | 725 elif self["MULTIPROCESS"] == "thread": |
| 719 class ThreadingServer(SocketServer.ThreadingMixIn, | 726 class ThreadingServer(socketserver.ThreadingMixIn, |
| 720 base_server): | 727 base_server): |
| 721 pass | 728 pass |
| 722 server_class = ThreadingServer | 729 server_class = ThreadingServer |
| 723 else: | 730 else: |
| 724 server_class = base_server | 731 server_class = base_server |