Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.4 (#23873)

This commit is contained in:
Benjamin Peterson 2015-04-07 12:00:37 -04:00
parent 62f5278854 033c58ad97
commit 43a1bed3d2
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/smtpd.py
View File

@ -525,9 +525,6 @@ class SMTPChannel(asynchat.async_chat):
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 @@ class SMTPChannel(asynchat.async_chat):
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')