summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-17 17:07:57 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-12-17 17:07:57 (GMT)
commit80ab6c53c6d90c0fae3828e5888d864d44b1c2ca (patch)
tree1075a3985e0d27748605f2d5cb0774d216c9baf6 /Lib
parentc2a8169aa30c8f7dee3b874661f73e0b9c3f0919 (diff)
parented3f6c6c79314df3d88ff3523c89f431d5666838 (diff)
downloadcpython-80ab6c53c6d90c0fae3828e5888d864d44b1c2ca.zip
cpython-80ab6c53c6d90c0fae3828e5888d864d44b1c2ca.tar.gz
cpython-80ab6c53c6d90c0fae3828e5888d864d44b1c2ca.tar.bz2
merge heads
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/smtplib.py4
1 files changed, 2 insertions, 2 deletions
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 @@ class LMTP(SMTP):
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