summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-05-05 19:41:23 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-05-05 19:41:23 (GMT)
commit7ef909cdd7af66d63eedf68519eed146fdf5de39 (patch)
treed849f835741eae51acd1140c2df9c4e0caea0e43 /Lib/multiprocessing
parent16f6f8338b649345ff6de7c49b1d691102ef3b22 (diff)
downloadcpython-7ef909cdd7af66d63eedf68519eed146fdf5de39.zip
cpython-7ef909cdd7af66d63eedf68519eed146fdf5de39.tar.gz
cpython-7ef909cdd7af66d63eedf68519eed146fdf5de39.tar.bz2
Fix for issue 14725 for 3.2 branch
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/connection.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 8bb0a3b..f537a36 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -360,7 +360,10 @@ if sys.platform == 'win32':
try:
win32.ConnectNamedPipe(handle, win32.NULL)
except WindowsError as e:
- if e.args[0] != win32.ERROR_PIPE_CONNECTED:
+ # ERROR_NO_DATA can occur if a client has already connected,
+ # written data and then disconnected -- see Issue 14725.
+ if e.args[0] not in (win32.ERROR_PIPE_CONNECTED,
+ win32.ERROR_NO_DATA):
raise
return _multiprocessing.PipeConnection(handle)