From 0ad7358c2f9e04c4d26271020cf31b41f6616c79 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 28 Aug 2011 01:18:31 +0200 Subject: Provide a better diagnosis on socket errors --- Lib/smtplib.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 @@ 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") -- cgit v0.12