commit 51a035e383978ee0a529a35a7ecbde41c45ab99d
author Kristján Valur Jónsson <kristjan@ccpgames.com> Thu Jan 15 17:20:21 2009 +0000
committer Kristján Valur Jónsson <kristjan@ccpgames.com> Thu Jan 15 17:20:21 2009 +0000
tree 1df4f900f65307dd7aec0e69ad7463e1344c69a5
parent a200dd5584d227d041aa8271be8b767a5cd8c4c8

Issue 4929:  Handle socket errors when receiving

Lib/smtplib.py

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index afa38bc..69d7f71 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -334,7 +334,10 @@
         if self.file is None:
             self.file = self.sock.makefile('rb')
         while 1:
-            line = self.file.readline()
+            try:
+                line = self.file.readline()
+            except socket.error:
+                line = ''
             if line == '':
                 self.close()
                 raise SMTPServerDisconnected("Connection unexpectedly closed")