Issue #18455: multiprocessing should not retry connect() with same socket.
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 @@
'''
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 @@
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.