Skip to content

Commit

Permalink
Issue #25931: Don't defining socketserver.Forking* names on platforms…
Browse files Browse the repository at this point in the history
… such

as Windows that do not support os.fork().
  • Loading branch information
gpshead committed Jun 3, 2016
1 parent cc46cb4 commit aadff9b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
17 changes: 11 additions & 6 deletions Lib/socketserver.py
Expand Up @@ -134,10 +134,12 @@ class will essentially render the service "deaf" while one request is
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",
Expand Down Expand Up @@ -537,7 +539,9 @@ def close_request(self, request):
# 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."""

Expand Down Expand Up @@ -647,8 +651,9 @@ def process_request(self, request, client_address):
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
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS
Expand Up @@ -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.

Expand Down

0 comments on commit aadff9b

Please sign in to comment.