Merged revisions 75301 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75301 | r.david.murray | 2009-10-09 17:50:54 -0400 (Fri, 09 Oct 2009) | 5 lines

  Issue #7082: When falling back to the MIME 'name' parameter, the
  correct place to look for it is the Content-Type header.

  Patch by Darren Worrall.
........
This commit is contained in:
R. David Murray 2009-10-10 00:13:32 +00:00
parent 70affb3743
commit bf2e0aaf41
4 changed files with 7 additions and 5 deletions

View file

@ -681,7 +681,7 @@ class Message:
missing = object()
filename = self.get_param('filename', missing, 'content-disposition')
if filename is missing:
filename = self.get_param('name', missing, 'content-disposition')
filename = self.get_param('name', missing, 'content-type')
if filename is missing:
return failobj
return utils.collapse_rfc2231_value(filename).strip()