cpython: ea21b99d002e (original) (raw)

Mercurial > cpython

changeset 95476:ea21b99d002e

merge 3.4 (#23873) [#23873]

Benjamin Peterson benjamin@python.org
date	Tue, 07 Apr 2015 12:00:37 -0400
parents	b01e69847321(current diff)81ce9d412a4c(diff)
children	a48e76252952
files	Lib/smtpd.py
diffstat	1 files changed, 0 insertions(+), 9 deletions(-)[+] [-] Lib/smtpd.py 9

line wrap: on

line diff

--- 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:[](#l1.7)
```
```
       self.push(syntaxerr)[](#l1.8)
```

       return[](#l1.9)
   if self.mailfrom:[](#l1.10)
       self.push('503 Error: nested MAIL command')[](#l1.11)
       return[](#l1.12)

@@ -586,15 +583,9 @@ class SMTPChannel(asynchat.async_chat): else: self.push(syntaxerr) return

```
   if not address:[](#l1.17)
```
```
       self.push(syntaxerr)[](#l1.18)
```

       return[](#l1.19)
   if params and len(params.keys()) > 0:[](#l1.20)
       self.push('555 RCPT TO parameters not recognized or not implemented')[](#l1.21)
       return[](#l1.22)

```
   if not address:[](#l1.23)
```

       self.push('501 Syntax: RCPT TO: <address>')[](#l1.24)

       return[](#l1.25)
   self.rcpttos.append(address)[](#l1.26)
   print('recips:', self.rcpttos, file=DEBUGSTREAM)[](#l1.27)
   self.push('250 OK')[](#l1.28)