From 7034db330613c658d55e809218ab01381a0eb388 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Tue, 27 Oct 2009 23:39:06 +0000 Subject: [PATCH] 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 +- Lib/email/test/data/msg_44.txt | 6 ++---- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index 129f4ba405..db09deefe2 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -674,7 +674,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() diff --git a/Lib/email/test/data/msg_44.txt b/Lib/email/test/data/msg_44.txt index ae462a61be..15a225287b 100644 --- a/Lib/email/test/data/msg_44.txt +++ b/Lib/email/test/data/msg_44.txt @@ -16,16 +16,14 @@ X-Oblique-Strategy: Make a door into a window --h90VIIIKmx -Content-Type: text/plain -Content-Disposition: inline; name="msg.txt" +Content-Type: text/plain; name="msg.txt" Content-Transfer-Encoding: 7bit a simple kind of mirror to reflect upon our own --h90VIIIKmx -Content-Type: text/plain -Content-Disposition: inline; name="msg.txt" +Content-Type: text/plain; name="msg.txt" Content-Transfer-Encoding: 7bit a simple kind of mirror diff --git a/Misc/ACKS b/Misc/ACKS index 592e721435..f1470ba807 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -781,6 +781,7 @@ Klaus-Juergen Wolf Dan Wolfe Richard Wolff Gordon Worley +Darren Worrall Thomas Wouters Heiko Wundram Doug Wyatt diff --git a/Misc/NEWS b/Misc/NEWS index 412a52c126..400450fab6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,9 @@ Core and Builtins Library ------- +- Issue #7082: When falling back to the MIME 'name' parameter, the + correct place to look for it is the Content-Type header. + - Issue #7099: Decimal.is_normal now returns True for numbers with exponent larger than emax. -- 2.50.1