[Python-checkins] cpython: Issue #25931: Don't defining socketserver.Forking* names on platforms such
gregory.p.smith
python-checkins at python.org
Thu Jun 2 20:16:09 EDT 2016
https://hg.python.org/cpython/rev/d772400a1211
changeset: 101630:d772400a1211
user: Gregory P. Smith <greg at krypto.org> [Google Inc.]
date: Fri Jun 03 00:13:36 2016 +0000
summary:
Issue #25931: Don't defining socketserver.Forking* names on platforms such
as Windows that do not support os.fork().
files:
Lib/socketserver.py | 17 +++++++++++------
Misc/NEWS | 3 +++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -134,10 +134,12 @@
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 @@
# 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 @@
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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,9 @@
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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list