diff -r 04eb89e078b5 Lib/smtplib.py --- a/Lib/smtplib.py Sun Dec 09 16:22:17 2012 +1000 +++ b/Lib/smtplib.py Sun Dec 09 18:15:09 2012 +0200 @@ -920,13 +920,13 @@ self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.file = None self.sock.connect(host) - except socket.error as msg: + except socket.error: if self.debuglevel > 0: print('connect fail:', host, file=stderr) if self.sock: self.sock.close() self.sock = None - raise socket.error(msg) + raise (code, msg) = self.getreply() if self.debuglevel > 0: print('connect:', msg, file=stderr)