merge heads

Lib/test/test_multibytecodec_support.py

@@ -58,11 +58,16 @@ class TestBase:
                 result = func(source, scheme)[0]
                 if func is self.decode:
                     self.assertTrue(type(result) is str, type(result))
+                    self.assertEqual(result, expected,
+                                     '%a.decode(%r, %r)=%a != %a'
+                                     % (source, self.encoding, scheme, result,
+                                        expected))
                 else:
                     self.assertTrue(type(result) is bytes, type(result))
                     self.assertEqual(result, expected,
-                                 '%a.decode(%r)=%a != %a'
-                                 % (source, self.encoding, result, expected))
+                                     '%a.encode(%r, %r)=%a != %a'
+                                     % (source, self.encoding, scheme, result,
+                                        expected))
             else:
                 self.assertRaises(UnicodeError, func, source, scheme)
 
@@ -279,6 +284,7 @@ class TestBase_Mapping(unittest.TestCase):
     pass_enctest = []
     pass_dectest = []
     supmaps = []
+    codectests = []
 
     def __init__(self, *args, **kw):
         unittest.TestCase.__init__(self, *args, **kw)
@@ -348,6 +354,30 @@ class TestBase_Mapping(unittest.TestCase):
         if (csetch, unich) not in self.pass_dectest:
             self.assertEqual(str(csetch, self.encoding), unich)
 
+    def test_errorhandle(self):
+        for source, scheme, expected in self.codectests:
+            if isinstance(source, bytes):
+                func = source.decode
+            else:
+                func = source.encode
+            if expected:
+                if isinstance(source, bytes):
+                    result = func(self.encoding, scheme)
+                    self.assertTrue(type(result) is str, type(result))
+                    self.assertEqual(result, expected,
+                                     '%a.decode(%r, %r)=%a != %a'
+                                     % (source, self.encoding, scheme, result,
+                                        expected))
+                else:
+                    result = func(self.encoding, scheme)
+                    self.assertTrue(type(result) is bytes, type(result))
+                    self.assertEqual(result, expected,
+                                     '%a.encode(%r, %r)=%a != %a'
+                                     % (source, self.encoding, scheme, result,
+                                        expected))
+            else:
+                self.assertRaises(UnicodeError, func, self.encoding, scheme)
+
 def load_teststring(name):
     dir = os.path.join(os.path.dirname(__file__), 'cjkencodings')
     with open(os.path.join(dir, name + '.txt'), 'rb') as f:

Modules/cjkcodecs/_codecs_hk.c

@@ -115,14 +115,15 @@ DECODER(big5hkscs)
 
         REQUIRE_INBUF(2)
 
-        if (0xc6 <= c && c <= 0xc8 && (c >= 0xc7 || IN2 >= 0xa1))
-            goto hkscsdec;
-
+        if (0xc6 > c || c > 0xc8 || (c < 0xc7 && IN2 < 0xa1)) {
             TRYMAP_DEC(big5, **outbuf, c, IN2) {
                 NEXT(2, 1)
+                continue;
             }
-        else
-hkscsdec:       TRYMAP_DEC(big5hkscs, decoded, c, IN2) {
+        }
+
+        TRYMAP_DEC(big5hkscs, decoded, c, IN2)
+        {
             int s = BH2S(c, IN2);
             const unsigned char *hintbase;
 
@@ -152,8 +153,9 @@ hkscsdec:       TRYMAP_DEC(big5hkscs, decoded, c, IN2) {
                     OUT1(decoded)
                     NEXT(2, 1)
             }
+            continue;
         }
-                else {
+
         switch ((c << 8) | IN2) {
         case 0x8862: WRITE2(0x00ca, 0x0304); break;
         case 0x8864: WRITE2(0x00ca, 0x030c); break;
@@ -164,7 +166,6 @@ hkscsdec:       TRYMAP_DEC(big5hkscs, decoded, c, IN2) {
 
         NEXT(2, 2) /* all decoded codepoints are pairs, above. */
     }
-    }
 
     return 0;
 }