From 51a035e383978ee0a529a35a7ecbde41c45ab99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Thu, 15 Jan 2009 17:20:21 +0000 Subject: [PATCH] Issue 4929: Handle socket errors when receiving --- Lib/smtplib.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/smtplib.py b/Lib/smtplib.py index afa38bc7f43..69d7f71d96a 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")