summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-12-02 11:21:02 -0500
committerBenjamin Peterson <benjamin@python.org>2012-12-02 11:21:02 -0500
commit26e5335a46f34944da7fd20ab8b1574fae6a5585 (patch)
treea4882123d64823f69311b4fef8c4d73f1162d5d4 /Lib/test
parent3d490d4eff6980ab1577db5567d0ab457aa0c501 (diff)
parent47a00f3d1a1fe3774d92e5d9263ef3bff79dd4ac (diff)
downloadcpython-git-26e5335a46f34944da7fd20ab8b1574fae6a5585.tar.gz
merge 3.3 (#16585)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_multibytecodec.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py
index feb7bd595a..7b47cb50e8 100644
--- a/Lib/test/test_multibytecodec.py
+++ b/Lib/test/test_multibytecodec.py
@@ -45,6 +45,10 @@ class Test_MultibyteCodec(unittest.TestCase):
self.assertRaises(IndexError, dec,
b'apple\x92ham\x93spam', 'test.cjktest')
+ def test_errorhandler_returns_bytes(self):
+ enc = "\u30fb\udc80".encode('gb18030', 'surrogateescape')
+ self.assertEqual(enc, b'\x819\xa79\x80')
+
def test_codingspec(self):
try:
for enc in ALL_CJKENCODINGS: