diff options
| author | Georg Brandl <georg@python.org> | 2008-02-01 11:56:49 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-02-01 11:56:49 (GMT) |
| commit | f69451833191454bfef75804c2654dc37e8f3e93 (patch) | |
| tree | 7e81560f5276c35f68b7b02e75feb9221a82ae5d /Doc/library/email.util.rst | |
| parent | f25ef50549d9f2bcb6294fe61a9902490728edcc (diff) | |
| download | cpython-f69451833191454bfef75804c2654dc37e8f3e93.zip cpython-f69451833191454bfef75804c2654dc37e8f3e93.tar.gz cpython-f69451833191454bfef75804c2654dc37e8f3e93.tar.bz2 | |
Update docs w.r.t. PEP 3100 changes -- patch for GHOP by Dan Finnie.
Diffstat (limited to 'Doc/library/email.util.rst')
| -rw-r--r-- | Doc/library/email.util.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/email.util.rst b/Doc/library/email.util.rst index 2396fb7..49428f4 100644 --- a/Doc/library/email.util.rst +++ b/Doc/library/email.util.rst @@ -130,10 +130,10 @@ There are several useful utilities provided in the :mod:`email.utils` module: When a header parameter is encoded in :rfc:`2231` format, :meth:`Message.get_param` may return a 3-tuple containing the character set, language, and value. :func:`collapse_rfc2231_value` turns this into a unicode - string. Optional *errors* is passed to the *errors* argument of the built-in - :func:`unicode` function; it defaults to ``replace``. Optional + string. Optional *errors* is passed to the *errors* argument of :class:`str`'s + :func:`encode` method; it defaults to ``'replace'``. Optional *fallback_charset* specifies the character set to use if the one in the - :rfc:`2231` header is not known by Python; it defaults to ``us-ascii``. + :rfc:`2231` header is not known by Python; it defaults to ``'us-ascii'``. For convenience, if the *value* passed to :func:`collapse_rfc2231_value` is not a tuple, it should be a string and it is returned unquoted. |