From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 27 Aug 2011 23:18:31 +0000 (+0200)
Subject: Provide a better diagnosis on socket errors
X-Git-Tag: v2.7.3rc1~485
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ad7358c2f9e04c4d26271020cf31b41f6616c79;p=thirdparty%2FPython%2Fcpython.git

Provide a better diagnosis on socket errors
---

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index f9576367f09c..07582f673bc0 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -352,8 +352,10 @@ class SMTP:
         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")