[Python-checkins] cpython (merge 3.5 -> 3.5): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/f0a86a0d303a
changeset:   102310:f0a86a0d303a
branch:      3.5
parent:      102308:dac248056b20
parent:      102306:26342c9e8c1d
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Jul 10 21:34:05 2016 +0300
summary:
  Merge heads

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