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

[neal.norwitz]

Author: neal.norwitz
Date: Tue Oct 23 07:35:11 2007
New Revision: 58599

Modified:
   python/branches/release25-maint/Lib/smtpd.py
   python/branches/release25-maint/Misc/NEWS
Log:
Backport 58594:
Issue #1307, patch by Derek Shockey.
When "MAIL" is received without args, an exception happens instead of
sending a 501 syntax error response.


Modified: python/branches/release25-maint/Lib/smtpd.py
==============================================================================
--- python/branches/release25-maint/Lib/smtpd.py	(original)
+++ python/branches/release25-maint/Lib/smtpd.py	Tue Oct 23 07:35:11 2007
@@ -221,7 +221,7 @@
 
     def smtp_MAIL(self, arg):
         print >> DEBUGSTREAM, '===> MAIL', arg
-        address = self.__getaddr('FROM:', arg)
+        address = self.__getaddr('FROM:', arg) if arg else None
         if not address:
             self.push('501 Syntax: MAIL FROM:<address>')
             return

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Oct 23 07:35:11 2007
@@ -32,6 +32,8 @@
 Library
 -------
 
+- Bug #1307: Fix smtpd so it doesn't raise an exception when there is no arg.
+
 - ctypes will now work correctly on 32-bit systems when Python is
   configured with --with-system-ffi.