From 290e939f2e22d459d7e22f39e6a5660a8a2f4e96 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Sat, 10 Oct 2009 00:57:04 +0000 Subject: [PATCH] Merged revisions 75307 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75307 | r.david.murray | 2009-10-09 20:13:32 -0400 (Fri, 09 Oct 2009) | 12 lines 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 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() 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 5ca044680c..e8005e9087 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -811,6 +811,7 @@ David Wolever Klaus-Juergen Wolf Dan Wolfe Richard Wolff +Darren Worrall Gordon Worley Thomas Wouters Heiko Wundram diff --git a/Misc/NEWS b/Misc/NEWS index 1d8d744618..49e7d1a370 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,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. + - Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the builtin tokenizer. -- 2.40.0