summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-10-10 00:13:32 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-10-10 00:13:32 (GMT)
commitbf2e0aaf41958fd90d765b0e480a9885aee4de91 (patch)
treec1438d20281dd747d2acc9254d2a4daff839e57f /Lib/email
parent70affb374333b5051a3f848809b53f2e3d23cd09 (diff)
downloadcpython-bf2e0aaf41958fd90d765b0e480a9885aee4de91.zip
cpython-bf2e0aaf41958fd90d765b0e480a9885aee4de91.tar.gz
cpython-bf2e0aaf41958fd90d765b0e480a9885aee4de91.tar.bz2
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. ........
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/message.py2
-rw-r--r--Lib/email/test/data/msg_44.txt6
2 files changed, 3 insertions, 5 deletions
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 @@ 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 ae462a6..15a2252 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