From c8ef9bc69471b3f5a789dad61d2330cf8193926c Mon Sep 17 00:00:00 2001 From: Richard Oudkerk Date: Mon, 15 Jul 2013 18:37:48 +0100 Subject: Issue #18455: multiprocessing should not retry connect() with same socket. --- Lib/multiprocessing/connection.py | 7 ++++--- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index a051730..1a29c36 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -294,15 +294,16 @@ def SocketClient(address): ''' Return a connection object connected to the socket given by `address` ''' - family = address_type(address) - s = socket.socket( getattr(socket, family) ) - s.setblocking(True) + family = getattr(socket, address_type(address)) t = _init_timeout() while 1: + s = socket.socket(family) + s.setblocking(True) try: s.connect(address) except socket.error, e: + s.close() if e.args[0] != errno.ECONNREFUSED or _check_timeout(t): debug('failed to connect to address %s', address) raise diff --git a/Misc/NEWS b/Misc/NEWS index e074d7f..0b2dadf 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -26,6 +26,8 @@ Core and Builtins Library ------- +- Issue #18455: multiprocessing should not retry connect() with same socket. + - Issue #18101: Tcl.split() now process Unicode strings nested in a tuple as it do with byte strings. -- cgit v0.12