diff options
| author | R David Murray <rdmurray@bitdance.com> | 2016-07-10 18:00:51 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2016-07-10 18:00:51 (GMT) |
| commit | a7425c5e37614bedad2b515d017c8dfe6ae0e7af (patch) | |
| tree | b61b1505b47a13c39caf4577b99ba3ab177e502e | |
| parent | 9bdb1edf35a5ee96f89973f55c52bb7da86dbd9e (diff) | |
| parent | 7a139c50dbf98f3f064d0028aeca76952d8785db (diff) | |
| download | cpython-a7425c5e37614bedad2b515d017c8dfe6ae0e7af.zip cpython-a7425c5e37614bedad2b515d017c8dfe6ae0e7af.tar.gz cpython-a7425c5e37614bedad2b515d017c8dfe6ae0e7af.tar.bz2 | |
Merge: #26176: fix usage of Address constructor in email examples.
| -rw-r--r-- | Doc/includes/email-alternative-new-api.py | 6 | ||||
| -rw-r--r-- | Doc/library/email-examples.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/includes/email-alternative-new-api.py b/Doc/includes/email-alternative-new-api.py index c1255a6..321f727 100644 --- a/Doc/includes/email-alternative-new-api.py +++ b/Doc/includes/email-alternative-new-api.py @@ -9,9 +9,9 @@ from email.utils import make_msgid # Create the base text message. msg = EmailMessage() msg['Subject'] = "Ayons asperges pour le déjeuner" -msg['From'] = Address("Pepé Le Pew", "pepe@example.com") -msg['To'] = (Address("Penelope Pussycat", "penelope@example.com"), - Address("Fabrette Pussycat", "fabrette@example.com")) +msg['From'] = Address("Pepé Le Pew", "pepe", "example.com") +msg['To'] = (Address("Penelope Pussycat", "penelope", "example.com"), + Address("Fabrette Pussycat", "fabrette", "example.com")) msg.set_content("""\ Salut! diff --git a/Doc/library/email-examples.rst b/Doc/library/email-examples.rst index cbbcb78..ca08586 100644 --- a/Doc/library/email-examples.rst +++ b/Doc/library/email-examples.rst @@ -61,7 +61,7 @@ way we could process it: Up to the prompt, the output from the above is:: - To: Penelope Pussycat <"penelope@example.com">, Fabrette Pussycat <"fabrette@example.com"> + To: Penelope Pussycat <penelope@example.com>, Fabrette Pussycat <fabrette@example.com> From: Pepé Le Pew <pepe@example.com> Subject: Ayons asperges pour le déjeuner |