commit 0ad7358c2f9e04c4d26271020cf31b41f6616c79
author Antoine Pitrou <solipsis@pitrou.net> Sun Aug 28 01:18:31 2011 +0200
committer Antoine Pitrou <solipsis@pitrou.net> Sun Aug 28 01:18:31 2011 +0200
tree 24b014bc55188aa06bde7d2b73bd207bc739531a
parent 0f697b300c5f2f579936ca82a00879a0d5a4531f

Provide a better diagnosis on socket errors

Lib/smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index f957636..07582f6 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -352,8 +352,10 @@
         while 1:
             try:
                 line = self.file.readline()
-            except socket.error:
-                line = ''
+            except socket.error as e:
+                self.close()
+                raise SMTPServerDisconnected("Connection unexpectedly closed: "
+                                             + str(e))
             if line == '':
                 self.close()
                 raise SMTPServerDisconnected("Connection unexpectedly closed")