diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-10-10 00:57:04 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-10-10 00:57:04 (GMT) |
| commit | 290e939f2e22d459d7e22f39e6a5660a8a2f4e96 (patch) | |
| tree | 1fc5dd3f231985d644639f5f651ca55bd61e87c4 | |
| parent | 0c7f9c96f5fbe8c445ccd3e2ee315f2e2f45a3ca (diff) | |
| download | cpython-290e939f2e22d459d7e22f39e6a5660a8a2f4e96.zip cpython-290e939f2e22d459d7e22f39e6a5660a8a2f4e96.tar.gz cpython-290e939f2e22d459d7e22f39e6a5660a8a2f4e96.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Lib/email/message.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/data/msg_44.txt | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 7 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 @@ -811,6 +811,7 @@ David Wolever Klaus-Juergen Wolf Dan Wolfe Richard Wolff +Darren Worrall Gordon Worley Thomas Wouters Heiko Wundram @@ -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. |