summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-07-10 17:59:01 (GMT)
committerR David Murray <rdmurray@bitdance.com>2016-07-10 17:59:01 (GMT)
commit7a139c50dbf98f3f064d0028aeca76952d8785db (patch)
tree53d77b69ed0b471e413c5af90203ca38c5c4f140
parent537ad7ad9fdefa44fdfd7f5cbee198ad381deb60 (diff)
downloadcpython-7a139c50dbf98f3f064d0028aeca76952d8785db.zip
cpython-7a139c50dbf98f3f064d0028aeca76952d8785db.tar.gz
cpython-7a139c50dbf98f3f064d0028aeca76952d8785db.tar.bz2
#26176: fix usage of Address constructor in email examples.
Patch by Nathan Harold.
-rw-r--r--Doc/includes/email-alternative-new-api.py6
-rw-r--r--Doc/library/email-examples.rst2
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