[Python-checkins] cpython (merge 3.5 -> default): Merge: #26176: fix usage of Address constructor in email examples.
r.david.murray
python-checkins at python.org
Sun Jul 10 14:01:09 EDT 2016
https://hg.python.org/cpython/rev/a9c11fecd83b
changeset: 102303:a9c11fecd83b
parent: 102300:e6e6c71776b0
parent: 102302:1530fd9a7089
user: R David Murray <rdmurray at bitdance.com>
date: Sun Jul 10 14:00:51 2016 -0400
summary:
Merge: #26176: fix usage of Address constructor in email examples.
files:
Doc/includes/email-alternative-new-api.py | 6 +++---
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
--- a/Doc/includes/email-alternative-new-api.py
+++ b/Doc/includes/email-alternative-new-api.py
@@ -9,9 +9,9 @@
# Create the base text message.
msg = EmailMessage()
msg['Subject'] = "Ayons asperges pour le déjeuner"
-msg['From'] = Address("Pepé Le Pew", "pepe at example.com")
-msg['To'] = (Address("Penelope Pussycat", "penelope at example.com"),
- Address("Fabrette Pussycat", "fabrette at 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
--- a/Doc/library/email-examples.rst
+++ b/Doc/library/email-examples.rst
@@ -61,7 +61,7 @@
Up to the prompt, the output from the above is::
- To: Penelope Pussycat <"penelope at example.com">, Fabrette Pussycat <"fabrette at example.com">
+ To: Penelope Pussycat <penelope at example.com>, Fabrette Pussycat <fabrette at example.com>
From: Pepé Le Pew <pepe at example.com>
Subject: Ayons asperges pour le déjeuner
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list