diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-07 16:00:37 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-07 16:00:37 (GMT) |
| commit | 43a1bed3d21605081581f7f3eb8a731cd71ad51e (patch) | |
| tree | a8ba0265ca1117882bb4717426991fb37bfc3b7e /Lib/smtpd.py | |
| parent | 62f527885404bd35ff6bee5f01c81cb14c2b6beb (diff) | |
| parent | 033c58ad972973ab4b8a87bede922bc9bf1a2cf9 (diff) | |
| download | cpython-43a1bed3d21605081581f7f3eb8a731cd71ad51e.zip cpython-43a1bed3d21605081581f7f3eb8a731cd71ad51e.tar.gz cpython-43a1bed3d21605081581f7f3eb8a731cd71ad51e.tar.bz2 | |
merge 3.4 (#23873)
Diffstat (limited to 'Lib/smtpd.py')
| -rwxr-xr-x | Lib/smtpd.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Lib/smtpd.py b/Lib/smtpd.py index 69cdcdc..dd410b8 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -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') |