commit 80ab6c53c6d90c0fae3828e5888d864d44b1c2ca
author Andrew Svetlov <andrew.svetlov@gmail.com> Mon Dec 17 19:07:57 2012 +0200
committer Andrew Svetlov <andrew.svetlov@gmail.com> Mon Dec 17 19:07:57 2012 +0200
tree 1075a3985e0d27748605f2d5cb0774d216c9baf6
parent c2a8169aa30c8f7dee3b874661f73e0b9c3f0919
parent ed3f6c6c79314df3d88ff3523c89f431d5666838

merge heads

Lib/smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 07582f6..099e54a 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -818,13 +818,13 @@
         try:
             self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             self.sock.connect(host)
-        except socket.error, msg:
+        except socket.error:
             if self.debuglevel > 0:
                 print>>stderr, 'connect fail:', host
             if self.sock:
                 self.sock.close()
             self.sock = None
-            raise socket.error, msg
+            raise
         (code, msg) = self.getreply()
         if self.debuglevel > 0:
             print>>stderr, "connect:", msg