summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial/stdlib.rst
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-17 18:30:38 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-17 18:30:38 (GMT)
commitf10aa9825e49e8652f30bc6d92c736fe47bb134c (patch)
treec804ba7c7ea948e6814767246b6ba2dec41bac5d /Doc/tutorial/stdlib.rst
parenteb1cf4e73beca52f8bc3b5ba9d5cef3632470a5b (diff)
downloadcpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.zip
cpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.tar.gz
cpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.tar.bz2
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.
Diffstat (limited to 'Doc/tutorial/stdlib.rst')
-rw-r--r--Doc/tutorial/stdlib.rst12
1 files changed, 7 insertions, 5 deletions
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 7bbc5ef..dcd6659 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -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: