diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-03-04 17:43:40 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-03-04 17:43:40 (GMT) |
| commit | 9fc20536a42c0930d300e47716c87acae450eddd (patch) | |
| tree | 4a8d577f87c9a20faa73f0234965c9eb9dc888ed /Doc/library/email.message.rst | |
| parent | 1dad6501ce23897db9fc7ff57b779e4047dad951 (diff) | |
| download | cpython-9fc20536a42c0930d300e47716c87acae450eddd.zip cpython-9fc20536a42c0930d300e47716c87acae450eddd.tar.gz cpython-9fc20536a42c0930d300e47716c87acae450eddd.tar.bz2 | |
Merged revisions 78657 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r78657 | r.david.murray | 2010-03-04 12:38:18 -0500 (Thu, 04 Mar 2010) | 10 lines
Merged revisions 78656 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78656 | r.david.murray | 2010-03-04 12:34:05 -0500 (Thu, 04 Mar 2010) | 3 lines
Fix documentation of email.Message.get_filename to match
the fix applied in Issue 7082.
........
................
Diffstat (limited to 'Doc/library/email.message.rst')
| -rw-r--r-- | Doc/library/email.message.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst index 7e939c9..9dcb2b4 100644 --- a/Doc/library/email.message.rst +++ b/Doc/library/email.message.rst @@ -415,9 +415,10 @@ Here are the methods of the :class:`Message` class: Return the value of the ``filename`` parameter of the :mailheader:`Content-Disposition` header of the message. If the header does not have a ``filename`` parameter, this method falls back to looking - for the ``name`` parameter. If neither is found, or the header is - missing, then *failobj* is returned. The returned string will always be - unquoted as per :func:`email.utils.unquote`. + for the ``name`` parameter on the :mailheader:`Content-Type` header. If + neither is found, or the header is missing, then *failobj* is returned. + The returned string will always be unquoted as per + :func:`email.utils.unquote`. .. method:: get_boundary(failobj=None) |