summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_email
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2011-06-18 16:32:27 (GMT)
committerR David Murray <rdmurray@bitdance.com>2011-06-18 16:32:27 (GMT)
commit7df08379c65b623df96a534fdacd7302c6a24476 (patch)
treedd936871f360b08e2ff291cb4a72a3d665a29add /Lib/test/test_email
parent6a738450827ea77bf8645b14a304a928b7c4ff47 (diff)
parent6bdb1769dcd1a95a7f6fa7d98d05e835be931466 (diff)
downloadcpython-7df08379c65b623df96a534fdacd7302c6a24476.zip
cpython-7df08379c65b623df96a534fdacd7302c6a24476.tar.gz
cpython-7df08379c65b623df96a534fdacd7302c6a24476.tar.bz2
merge #11584: make decode_header handle Header objects correctly
This updates 12e39cd7a0e4 (merge of b21fdfa0019c), which fixed this bug incorrectly.
Diffstat (limited to 'Lib/test/test_email')
-rw-r--r--Lib/test/test_email/test_email.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 1657afc..aad565c 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -4324,8 +4324,8 @@ A very long line that must get split to something other than at the
def test_escaped_8bit_header(self):
x = b'Ynwp4dUEbay Auction Semiar- No Charge \x96 Earn Big'
- x = x.decode('ascii', 'surrogateescape')
- h = Header(x, charset=email.charset.UNKNOWN8BIT)
+ e = x.decode('ascii', 'surrogateescape')
+ h = Header(e, charset=email.charset.UNKNOWN8BIT)
self.assertEqual(str(h),
'Ynwp4dUEbay Auction Semiar- No Charge \uFFFD Earn Big')
self.assertEqual(email.header.decode_header(h), [(x, 'unknown-8bit')])