diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-03-15 19:45:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-03-15 19:45:20 (GMT) |
| commit | e97a5b2bda0b1b0352137e564a93e0176b6619e5 (patch) | |
| tree | 364c998e611d1347d960263d6b539a02fad526cc /Lib/email/test/test_email.py | |
| parent | d6afe724cb8a701d6ad2adeb1d8d20e4fde6fca0 (diff) | |
| parent | ffdbbcaf715323f653388966eec5c42bf6b139c5 (diff) | |
| download | cpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.zip cpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.tar.gz cpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/email/test/test_email.py')
| -rw-r--r-- | Lib/email/test/test_email.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index f2d5210..3fa8f93 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -3372,9 +3372,9 @@ class TestCharset(unittest.TestCase): # built-in encodings where the header encoding is QP but the body # encoding is not. from email import charset as CharsetModule - CharsetModule.add_charset('fake', CharsetModule.QP, None) + CharsetModule.add_charset('fake', CharsetModule.QP, None, 'utf-8') c = Charset('fake') - eq('hello w\xf6rld', c.body_encode('hello w\xf6rld')) + eq('hello world', c.body_encode('hello world')) def test_unicode_charset_name(self): charset = Charset('us-ascii') |