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.
........
diff --git a/Lib/email/message.py b/Lib/email/message.py
index 412a550..d89e37e 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -681,7 +681,7 @@
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 ae462a6..15a2252 100644
--- a/Lib/email/test/data/msg_44.txt
+++ b/Lib/email/test/data/msg_44.txt
@@ -16,16 +16,14 @@
--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 8ef4198..bd76d43 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -820,6 +820,7 @@
Klaus-Juergen Wolf
Dan Wolfe
Richard Wolff
+Darren Worrall
Gordon Worley
Thomas Wouters
Heiko Wundram
diff --git a/Misc/NEWS b/Misc/NEWS
index f542bcb..b2c2e6f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -87,6 +87,9 @@
Library
-------
+- Issue #7082: When falling back to the MIME 'name' parameter, the
+ correct place to look for it is the Content-Type header.
+
- Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the
builtin tokenizer.