merge 3.3

2012-12-02 12:37:09 -05:00 · 2012-12-02 12:37:09 -05:00 · 661c346ab3
parent c77dd20698 2f560fa300
commit 661c346ab3
1 changed files with 1 additions and 1 deletions
--- a/Lib/test/multibytecodec_support.py
+++ b/Lib/test/multibytecodec_support.py
@ -113,7 +113,7 @@ class TestBase:
            return (ret, exc.end)
        codecs.register_error("test.cjktest", myreplace)

-        for ret in ([1, 2, 3], [], None, object(), b'string', b''):
+        for ret in ([1, 2, 3], [], None, object()):
            self.assertRaises(TypeError, self.encode, self.unmappedunicode,
                              'test.cjktest')