Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Doc/library/email.charset.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ new entries to the global character set, alias, and codec registries:

Optional *output_charset* is the character set that the output should be in.
Conversions will proceed from input charset, to Unicode, to the output charset
when the method :meth:`Charset.convert` is called. The default is to output in
the same character set as the input.
when the method :meth:`Charset.body_encode` is called. The default is to
output in the same character set as the input.

Both *input_charset* and *output_charset* must have Unicode codec entries in the
module's character set-to-codec mapping; use :func:`add_codec` to add codecs the
Expand Down
6 changes: 3 additions & 3 deletions Doc/library/email.parser.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ methods.
FeedParser API
^^^^^^^^^^^^^^

The :class:`BytesFeedParser`, imported from the :mod:`email.feedparser` module,
The :class:`BytesFeedParser`, imported from the :mod:`!email.feedparser` module,
provides an API that is conducive to incremental parsing of email messages,
such as would be necessary when reading the text of an email message from a
source that can block (such as a socket). The :class:`BytesFeedParser` can of
Expand Down Expand Up @@ -86,7 +86,7 @@ Here is the API for the :class:`BytesFeedParser`:
more information on what else *policy* controls, see the
:mod:`~email.policy` documentation.

Note: **The policy keyword should always be specified**; The default will
Note: **The policy keyword should always be specified**. The default will
change to :data:`email.policy.default` in a future version of Python.

.. versionadded:: 3.2
Expand Down Expand Up @@ -142,7 +142,7 @@ message body, instead setting the payload to the raw body.
arguments have the same meaning and semantics as the *_factory*
and *policy* arguments of :class:`BytesFeedParser`.

Note: **The policy keyword should always be specified**; The default will
Note: **The policy keyword should always be specified**. The default will
change to :data:`email.policy.default` in a future version of Python.

.. versionchanged:: 3.3
Expand Down
2 changes: 0 additions & 2 deletions Doc/tools/.nitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Doc/c-api/intro.rst
Doc/c-api/stable.rst
Doc/library/ast.rst
Doc/library/asyncio-extending.rst
Doc/library/email.charset.rst
Doc/library/email.parser.rst
Doc/library/http.cookiejar.rst
Doc/library/http.server.rst
Doc/library/importlib.rst
Expand Down
2 changes: 1 addition & 1 deletion Lib/email/charset.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def add_charset(charset, header_enc=None, body_enc=None, output_charset=None):
Optional output_charset is the character set that the output should be
in. Conversions will proceed from input charset, to Unicode, to the
output charset when the method Charset.convert() is called. The default
output charset when the method Charset.body_encode() is called. The default
is to output in the same character set as the input.
Both input_charset and output_charset must have Unicode codec entries in
Expand Down
Loading