From bf2e0aaf41958fd90d765b0e480a9885aee4de91 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 10 Oct 2009 00:13:32 +0000 Subject: 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. ........ --- Lib/email/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/email/message.py') diff --git a/Lib/email/message.py b/Lib/email/message.py index 412a550d27..d89e37e0b6 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -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() -- cgit v1.2.1