[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23873)

Tue Apr 7 18:01:49 CEST 2015

https://hg.python.org/cpython/rev/ea21b99d002e
changeset: 95476:ea21b99d002e
parent: 95474:b01e69847321
parent: 95475:81ce9d412a4c
user: Benjamin Peterson <benjamin at python.org>
date: Tue Apr 07 12:00:37 2015 -0400
summary:
 merge 3.4 (#23873)
files:
 Lib/smtpd.py | 9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -525,9 +525,6 @@
 if not self.extended_smtp and params:
 self.push(syntaxerr)
 return
- if not address:
- self.push(syntaxerr)
- return
 if self.mailfrom:
 self.push('503 Error: nested MAIL command')
 return
@@ -586,15 +583,9 @@
 else:
 self.push(syntaxerr)
 return
- if not address:
- self.push(syntaxerr)
- return
 if params and len(params.keys()) > 0:
 self.push('555 RCPT TO parameters not recognized or not implemented')
 return
- if not address:
- self.push('501 Syntax: RCPT TO: <address>')
- return
 self.rcpttos.append(address)
 print('recips:', self.rcpttos, file=DEBUGSTREAM)
 self.push('250 OK')
-- 
Repository URL: https://hg.python.org/cpython
