[Python-checkins] cpython (merge 3.2 -> default): Merge #16071: fix more email.message links in mailbox docs.
r.david.murray
python-checkins at python.org
Fri Sep 28 21:20:40 CEST 2012
http://hg.python.org/cpython/rev/f3bd51cdd958
changeset: 79225:f3bd51cdd958
parent: 79223:2a14542371b7
parent: 79224:70af6b53b52a
user: R David Murray <rdmurray at bitdance.com>
date: Fri Sep 28 15:19:42 2012 -0400
summary:
Merge #16071: fix more email.message links in mailbox docs.
files:
Doc/library/mailbox.rst | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -10,9 +10,9 @@
This module defines two classes, :class:`Mailbox` and :class:`Message`, for
accessing and manipulating on-disk mailboxes and the messages they contain.
:class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
-Maildir, mbox, MH, Babyl, and MMDF.
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
.. seealso::
@@ -81,7 +81,7 @@
it.
Parameter *message* may be a :class:`Message` instance, an
- :class:`email.Message.Message` instance, a string, a byte string, or a
+ :class:`email.message.Message` instance, a string, a byte string, or a
file-like object (which should be open in binary mode). If *message* is
an instance of the
appropriate format-specific :class:`Message` subclass (e.g., if it's an
@@ -112,7 +112,7 @@
:exc:`KeyError` exception if no message already corresponds to *key*.
As with :meth:`add`, parameter *message* may be a :class:`Message`
- instance, an :class:`email.Message.Message` instance, a string, a byte
+ instance, an :class:`email.message.Message` instance, a string, a byte
string, or a file-like object (which should be open in binary mode). If
*message* is an
instance of the appropriate format-specific :class:`Message` subclass
@@ -1268,7 +1268,7 @@
Set the message's visible headers to be the same as the headers in
*message*. Parameter *visible* should be a :class:`Message` instance, an
- :class:`email.Message.Message` instance, a string, or a file-like object
+ :class:`email.message.Message` instance, a string, or a file-like object
(which should be open in text mode).
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list