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 129f4ba..db09dee 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -674,7 +674,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 753ca7b..6383a46 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -807,6 +807,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 f1fad86..f3941c0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -398,6 +398,9 @@
Library
-------
+- Issue #7082: When falling back to the MIME 'name' parameter, the
+ correct place to look for it is the Content-Type header.
+
- Issue #7048: Force Decimal.logb to round its result when that result
is too large to fit in the current precision.