commit 6b2e160d279c031d714206007e22df9e177de44e
author Antoine Pitrou <solipsis@pitrou.net> Sun Aug 28 01:20:42 2011 +0200
committer Antoine Pitrou <solipsis@pitrou.net> Sun Aug 28 01:20:42 2011 +0200
tree e71cc12755a8013d20a6feb73f680ac2d7399468
parent 29646917c05a2d4ca7264191cb6568ddf6c09d04

Provide a better diagnosis on socket errors

Lib/smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 7b97a6a..13c56e1 100644
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -364,8 +364,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 not line:
                 self.close()
                 raise SMTPServerDisconnected("Connection unexpectedly closed")