commit f9844c8292c34fe4361d441164d83642fc76ce68
author R. David Murray <rdmurray@bitdance.com> Wed Jan 05 01:47:38 2011 +0000
committer R. David Murray <rdmurray@bitdance.com> Wed Jan 05 01:47:38 2011 +0000
tree fafccdd877c3db36d58e130583452a71f444dd74
parent 1d879f68525858fcfa7aacdd7cd16721a89c62c4

Merged revisions 87750 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87750 | r.david.murray | 2011-01-04 20:39:32 -0500 (Tue, 04 Jan 2011) | 5 lines

  #10790: make append work when output codec is different from input codec

  There's still a bug here (the encode call shouldn't use the 'errors'
  paramter), but I'll fix that later.
........

Lib/email/test/test_email.py

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index c9903ec..05eb6a7 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -3255,6 +3255,10 @@
         s = 'Subject: =?EUC-KR?B?CSixpLDtKSC/7Liuvsax4iC6uLmwMcijIKHaILzSwd/H0SC8+LCjwLsgv7W/+Mj3I ?='
         raises(errors.HeaderParseError, decode_header, s)
 
+    def test_shift_jis_charset(self):
+        h = Header('文', charset='shift_jis')
+        self.assertEqual(h.encode(), '=?iso-2022-jp?b?GyRCSjgbKEI=?=')
+
 
 
 # Test RFC 2231 header parameters (en/de)coding