cpython: d772400a1211 (original) (raw)

--- 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",[](#l1.8)

+all = ["BaseServer", "TCPServer", "UDPServer",

•       "ThreadingUDPServer", "ThreadingTCPServer",[](#l1.10)
        "BaseRequestHandler", "StreamRequestHandler",[](#l1.11)

•       "DatagramRequestHandler", "ThreadingMixIn", "ForkingMixIn"][](#l1.12)

•       "DatagramRequestHandler", "ThreadingMixIn"][](#l1.13)

+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

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -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.