Provide a better diagnosis on socket errors

b3128314 · Antoine Pitrou · d5d96018 · b3128314
Commit b3128314 authored Aug 28, 2011 by Antoine Pitrou
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Lib/smtplib.py Lib/smtplib.py +4 -2

No files found.
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -364,8 +364,10 @@ class SMTP:
        while 1:
            try:
                line = self.file.readline()
-            except socket.error:
+            except socket.error as e:
-                line = ''
+                self.close()
+                raise SMTPServerDisconnected("Connection unexpectedly closed: "
+                                             + str(e))
            if not line:
                self.close()
                raise SMTPServerDisconnected("Connection unexpectedly closed")