Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
cef1f83c
Commit
cef1f83c
authored
Jun 03, 2016
by
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #25931: Don't defining socketserver.Forking* names on platforms such
as Windows that do not support os.fork().
parent
3bad04ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
Lib/socketserver.py
Lib/socketserver.py
+11
-6
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/socketserver.py
View file @
cef1f83c
...
...
@@ -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
...
...
Misc/NEWS
View file @
cef1f83c
...
...
@@ -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
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment