Another merge. Only doc stuff was affected (but this aligns the UTF-32

codec changes in trubk and branch).  Hopefully the Py3k glossary wasn't
different from the trunk one.
This commit is contained in:
Guido van Rossum 2007-08-17 18:30:38 +00:00
parent eb1cf4e73b
commit f10aa9825e
6 changed files with 349 additions and 335 deletions

View file

@ -158,13 +158,15 @@ and :mod:`smtplib` for sending mail::
>>> import smtplib
>>> server = smtplib.SMTP('localhost')
>>> server.sendmail('soothsayer@example.org', 'jcaesar@example.org',
"""To: jcaesar@example.org
From: soothsayer@example.org
Beware the Ides of March.
""")
... """To: jcaesar@example.org
... From: soothsayer@example.org
...
... Beware the Ides of March.
... """)
>>> server.quit()
(Note that the second example needs a mailserver running on localhost.)
.. _tut-dates-and-times: