diff options
Diffstat (limited to 'Lib/email/Message.py')
-rw-r--r-- | Lib/email/Message.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/email/Message.py b/Lib/email/Message.py index b466f39..88fd786 100644 --- a/Lib/email/Message.py +++ b/Lib/email/Message.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2004 Python Software Foundation +# Copyright (C) 2001-2006 Python Software Foundation # Author: Barry Warsaw # Contact: email-sig@python.org @@ -701,11 +701,15 @@ class Message: """Return the filename associated with the payload if present. The filename is extracted from the Content-Disposition header's - `filename' parameter, and it is unquoted. + `filename' parameter, and it is unquoted. If that header is missing + the `filename' parameter, this method falls back to looking for the + `name' parameter. """ missing = object() filename = self.get_param('filename', missing, 'content-disposition') if filename is missing: + filename = self.get_param('name', missing, 'content-disposition') + if filename is missing: return failobj return Utils.collapse_rfc2231_value(filename).strip() |