diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-10-09 21:50:54 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-10-09 21:50:54 (GMT) |
| commit | 0c8bee639368324b750176ee171cadd33847f18e (patch) | |
| tree | 80ea562c781dd152e3b74f8633e04e5fdcb67a8f /Lib/email | |
| parent | 9586cf8677225ba3bae946de4813655c3db90f88 (diff) | |
| download | cpython-0c8bee639368324b750176ee171cadd33847f18e.zip cpython-0c8bee639368324b750176ee171cadd33847f18e.tar.gz cpython-0c8bee639368324b750176ee171cadd33847f18e.tar.bz2 | |
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.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/data/msg_44.txt | 6 |
2 files changed, 3 insertions, 5 deletions
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 @@ 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 |