diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-05-05 19:41:08 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-05-05 19:41:08 (GMT) |
| commit | 9a16fa69dda64ed01b2239a732c0445f22babb57 (patch) | |
| tree | 0bfcf7340ac53202c1db567ec9ee9120864329b6 /Lib/multiprocessing | |
| parent | c642f67c637b8a31d2e7781cb7b737b14937f711 (diff) | |
| download | cpython-9a16fa69dda64ed01b2239a732c0445f22babb57.zip cpython-9a16fa69dda64ed01b2239a732c0445f22babb57.tar.gz cpython-9a16fa69dda64ed01b2239a732c0445f22babb57.tar.bz2 | |
Fix for issue 14725 for 2.7 branch
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/connection.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index 530a8df..a02793f 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -348,7 +348,10 @@ if sys.platform == 'win32': try: win32.ConnectNamedPipe(handle, win32.NULL) except WindowsError, 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) |