diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-07 12:00:37 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-07 12:00:37 -0400 |
| commit | 0238f155cb123e844d6ac286c3d02ef9070e76e8 (patch) | |
| tree | 291e6e4d2f75d95634acf7aaf53b24f6226ed5da /Lib/smtpd.py | |
| parent | 4185a253861a34ea560d543e4d9e4bf09dcb231b (diff) | |
| parent | 9a055237102e409a3d24588612486c25e4da3c2e (diff) | |
| download | cpython-0238f155cb123e844d6ac286c3d02ef9070e76e8.tar.gz | |
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 69cdcdc446..dd410b8e16 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') |