[Python-checkins] r67686 - in python/branches/release25-maint: Lib/smtplib.py Misc/NEWS

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Dec 10 10:54:59 2008
New Revision: 67686

Log:
Issue #4302: Minor corrections to smtplib.

Modified:
   python/branches/release25-maint/Lib/smtplib.py
   python/branches/release25-maint/Misc/NEWS

Modified: python/branches/release25-maint/Lib/smtplib.py
==============================================================================
--- python/branches/release25-maint/Lib/smtplib.py	(original)
+++ python/branches/release25-maint/Lib/smtplib.py	Wed Dec 10 10:54:59 2008
@@ -315,7 +315,7 @@
     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 @@
     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()
 

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Wed Dec 10 10:54:59 2008
@@ -104,6 +104,8 @@
 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.