[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[andrew.svetlov]

http://hg.python.org/cpython/rev/fd57dbfa5765
changeset:   80914:fd57dbfa5765
branch:      2.7
parent:      80908:6e07be3dfb6b
parent:      80913:98b73c0103d9
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Mon Dec 17 19:07:57 2012 +0200
summary:
  merge heads

files:
  Lib/smtplib.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- 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

-- 
Repository URL: http://hg.python.org/cpython