From 6f63190ded3ceea7a66a41b5a48c6c4541372def Mon Sep 17 00:00:00 2001 From: Hirokazu Yamamoto Date: Wed, 10 Dec 2008 09:54:59 +0000 Subject: [PATCH] Issue #4302: Minor corrections to smtplib. (Backport r60975) --- Lib/smtplib.py | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 1b9739c81a..8651ba4167 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -315,7 +315,7 @@ class SMTP: def send(self, str): """Send `str' to the server.""" if self.debuglevel > 0: print>>stderr, 'send:', repr(str) - if self.sock: + if hasattr(self, 'sock') and self.sock: try: self.sock.sendall(str) except socket.error: @@ -503,7 +503,7 @@ class SMTP: vrfy=verify def expn(self, address): - """SMTP 'verify' command -- checks for address validity.""" + """SMTP 'expn' command -- expands a mailing list.""" self.putcmd("expn", quoteaddr(address)) return self.getreply() diff --git a/Misc/NEWS b/Misc/NEWS index 60a4c67de7..f6ea81069b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -104,6 +104,8 @@ Core and builtins Library ------- +- Issue #1776581 and #4302. Minor corrections to smtplib. + - Issue #3774: Fixed an error when create a Tkinter menu item without command and then remove it. -- 2.50.0