summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-03-04 17:38:18 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-03-04 17:38:18 (GMT)
commit9ed34bea3e3bf4e33e31d4a8d65b4778f0e5a50c (patch)
tree2f4eff4e34f5127a63c87db56f9841d92d84f283 /Doc
parentb519d23c167951f4f8a58137e322b09f5616019e (diff)
downloadcpython-9ed34bea3e3bf4e33e31d4a8d65b4778f0e5a50c.zip
cpython-9ed34bea3e3bf4e33e31d4a8d65b4778f0e5a50c.tar.gz
cpython-9ed34bea3e3bf4e33e31d4a8d65b4778f0e5a50c.tar.bz2
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')
-rw-r--r--Doc/library/email.message.rst7
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)