From 17bfef5860493a0195c999ab44d4c849660cac30 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Wed, 8 Nov 2000 22:19:47 +0000 Subject: 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. --- Lib/smtplib.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 @@ class SMTP: 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) -- cgit v0.12