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.
  ........
................
This commit is contained in:
R. David Murray 2010-03-04 17:43:40 +00:00
parent 1dad6501ce
commit 9fc20536a4
1 changed files with 4 additions and 3 deletions

View File

@ -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)