diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-01-15 17:20:21 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-01-15 17:20:21 (GMT) |
| commit | 51a035e383978ee0a529a35a7ecbde41c45ab99d (patch) | |
| tree | 1df4f900f65307dd7aec0e69ad7463e1344c69a5 /Lib/smtplib.py | |
| parent | a200dd5584d227d041aa8271be8b767a5cd8c4c8 (diff) | |
| download | cpython-51a035e383978ee0a529a35a7ecbde41c45ab99d.zip cpython-51a035e383978ee0a529a35a7ecbde41c45ab99d.tar.gz cpython-51a035e383978ee0a529a35a7ecbde41c45ab99d.tar.bz2 | |
Issue 4929: Handle socket errors when receiving
Diffstat (limited to 'Lib/smtplib.py')
| -rwxr-xr-x | Lib/smtplib.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ class SMTP: 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") |