(original) (raw)

changeset: 102303:a9c11fecd83b parent: 102300:e6e6c71776b0 parent: 102302:1530fd9a7089 user: R David Murray rdmurray@bitdance.com date: Sun Jul 10 14:00:51 2016 -0400 description: Merge: #26176: fix usage of Address constructor in email examples. diff -r e6e6c71776b0 -r a9c11fecd83b Doc/includes/email-alternative-new-api.py --- a/Doc/includes/email-alternative-new-api.py Sun Jul 10 13:46:34 2016 -0400 +++ b/Doc/includes/email-alternative-new-api.py Sun Jul 10 14:00:51 2016 -0400 @@ -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@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 -r e6e6c71776b0 -r a9c11fecd83b Doc/library/email-examples.rst --- a/Doc/library/email-examples.rst Sun Jul 10 13:46:34 2016 -0400 +++ b/Doc/library/email-examples.rst Sun Jul 10 14:00:51 2016 -0400 @@ -61,7 +61,7 @@ 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 /pepe@example.com/fabrette@example.com/penelope@example.com/rdmurray@bitdance.com