diff options
| author | Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org> | 2016-06-03 00:13:36 +0000 |
|---|---|---|
| committer | Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) <greg@krypto.org> | 2016-06-03 00:13:36 +0000 |
| commit | cef1f83c717d103575ab525040926db759d70d22 (patch) | |
| tree | 029e5228009a86b9f9b4908faebf89fff9e26428 | |
| parent | 3bad04ca62bba6d2a83f1c1f42d8840103aef015 (diff) | |
| download | cpython-git-cef1f83c717d103575ab525040926db759d70d22.tar.gz | |
Issue #25931: Don't defining socketserver.Forking* names on platforms such
as Windows that do not support os.fork().
| -rw-r--r-- | Lib/socketserver.py | 17 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 14 insertions, 6 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 70fdd6c861..4f8a5950c9 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -134,10 +134,12 @@ except ImportError: import dummy_threading as threading from time import monotonic as time -__all__ = ["BaseServer", "TCPServer", "UDPServer", "ForkingUDPServer", - "ForkingTCPServer", "ThreadingUDPServer", "ThreadingTCPServer", +__all__ = ["BaseServer", "TCPServer", "UDPServer", + "ThreadingUDPServer", "ThreadingTCPServer", "BaseRequestHandler", "StreamRequestHandler", - "DatagramRequestHandler", "ThreadingMixIn", "ForkingMixIn"] + "DatagramRequestHandler", "ThreadingMixIn"] +if hasattr(os, "fork"): + __all__.extend(["ForkingUDPServer","ForkingTCPServer", "ForkingMixIn"]) if hasattr(socket, "AF_UNIX"): __all__.extend(["UnixStreamServer","UnixDatagramServer", "ThreadingUnixStreamServer", @@ -537,7 +539,9 @@ class UDPServer(TCPServer): # No need to close anything. pass -class ForkingMixIn: +if hasattr(os, "fork"): + # Non-standard indentation on this statement to avoid reindenting the body. + class ForkingMixIn: """Mix-in class to handle each request in a new process.""" @@ -647,8 +651,9 @@ class ThreadingMixIn: t.start() -class ForkingUDPServer(ForkingMixIn, UDPServer): pass -class ForkingTCPServer(ForkingMixIn, TCPServer): pass +if hasattr(os, "fork"): + class ForkingUDPServer(ForkingMixIn, UDPServer): pass + class ForkingTCPServer(ForkingMixIn, TCPServer): pass class ThreadingUDPServer(ThreadingMixIn, UDPServer): pass class ThreadingTCPServer(ThreadingMixIn, TCPServer): pass @@ -22,6 +22,9 @@ Core and Builtins Library ------- +- Issue #25931: Don't defining socketserver.Forking* names on platforms such + as Windows that do not support os.fork(). + - Issue #21776: distutils.upload now correctly handles HTTPError. Initial patch by Claudiu Popa. |