diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-03-16 22:27:34 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-03-16 22:27:34 (GMT) |
| commit | 4e4326829f2997624261628081110bb87c090711 (patch) | |
| tree | 6f78da210fb486df2a75faa2597351d0ac3b5941 /Lib | |
| parent | a88da67bcbf8b87af613751796998538afb26be0 (diff) | |
| parent | de91276a5c90b9d3e42866054e48d255a37981b3 (diff) | |
| download | cpython-4e4326829f2997624261628081110bb87c090711.zip cpython-4e4326829f2997624261628081110bb87c090711.tar.gz cpython-4e4326829f2997624261628081110bb87c090711.tar.bz2 | |
Merge #11401 fix from 3.1.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/header.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/email/header.py b/Lib/email/header.py index d3118b0..8c32514 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -314,7 +314,7 @@ class Header: self._continuation_ws, splitchars) for string, charset in self._chunks: lines = string.splitlines() - formatter.feed(lines[0], charset) + formatter.feed(lines[0] if lines else '', charset) for line in lines[1:]: formatter.newline() if charset.header_encoding is not None: diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index b9fd8d0..dcb2e95 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -3698,6 +3698,13 @@ A very long line that must get split to something other than at the h = Header('文', charset='shift_jis') self.assertEqual(h.encode(), '=?iso-2022-jp?b?GyRCSjgbKEI=?=') + def test_flatten_header_with_no_value(self): + # Issue 11401 (regression from email 4.x) Note that the space after + # the header doesn't reflect the input, but this is also the way + # email 4.x behaved. At some point it would be nice to fix that. + msg = email.message_from_string("EmptyHeader:") + self.assertEqual(str(msg), "EmptyHeader: \n\n") + # Test RFC 2231 header parameters (en/de)coding |