SMTP.connect(): If the socket.connect() raises a socket.error, be sure
to call self.close() to reclaim some file descriptors, the reraise the
exception. Closes SF patch #102185 and SF bug #119833.
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 6536371..77cd223 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -214,7 +214,11 @@
if not port: port = SMTP_PORT
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
if self.debuglevel > 0: print 'connect:', (host, port)
- self.sock.connect((host, port))
+ try:
+ self.sock.connect((host, port))
+ except socket.error:
+ self.close()
+ raise
(code,msg)=self.getreply()
if self.debuglevel >0 : print "connect:", msg
return (code,msg)