diff options
author | Georg Brandl <georg@python.org> | 2008-11-07 09:39:56 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2008-11-07 09:39:56 (GMT) |
commit | a971c65f1dfc5eb02749456dac917686b3cb09c4 (patch) | |
tree | 44b1616530ac69a8329b0cd5306faa7699aaf5b6 /Doc/library/email.parser.rst | |
parent | 6570d071faca9cc5f8abbe3163969b8c0b0d76b4 (diff) | |
download | cpython-a971c65f1dfc5eb02749456dac917686b3cb09c4.zip cpython-a971c65f1dfc5eb02749456dac917686b3cb09c4.tar.gz cpython-a971c65f1dfc5eb02749456dac917686b3cb09c4.tar.bz2 |
Merged revisions 67117-67119,67123-67124,67143 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines
#4268: Use correct module for two toplevel functions.
........
r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines
#4267: small fixes in sqlite3 docs.
........
r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines
#4245: move Thread section to the top.
........
r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines
#4247: add "pass" examples to tutorial.
........
r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line
Fix grammar error; reword two paragraphs
........
r67143 | georg.brandl | 2008-11-07 09:27:39 +0100 (Fri, 07 Nov 2008) | 2 lines
Fix syntax.
........
Diffstat (limited to 'Doc/library/email.parser.rst')
-rw-r--r-- | Doc/library/email.parser.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst index 7a00912..43f0238 100644 --- a/Doc/library/email.parser.rst +++ b/Doc/library/email.parser.rst @@ -145,6 +145,7 @@ Since creating a message object structure from a string or a file object is such a common task, two functions are provided as a convenience. They are available in the top-level :mod:`email` package namespace. +.. currentmodule:: email .. function:: message_from_string(s[, _class[, strict]]) |