From d1cb68c7995fec87f0ffa90cf87922b387a5e7ef Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 30 May 2011 22:56:00 +0200
Subject: Close #12171: IncrementalEncoder.reset() of CJK codecs
 (multibytecodec) calls encreset() instead of decreset().

---
 Lib/test/test_multibytecodec.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Lib/test/test_multibytecodec.py')

diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py
index 86c68dcd9a..44480723ba 100644
--- a/Lib/test/test_multibytecodec.py
+++ b/Lib/test/test_multibytecodec.py
@@ -260,7 +260,8 @@ class TestStateful(unittest.TestCase):
     text = '\u4E16\u4E16'
     encoding = 'iso-2022-jp'
     expected = b'\x1b$B@$@$'
-    expected_reset = b'\x1b$B@$@$\x1b(B'
+    reset = b'\x1b(B'
+    expected_reset = expected + reset
 
     def test_encode(self):
         self.assertEqual(self.text.encode(self.encoding), self.expected_reset)
@@ -271,6 +272,8 @@ class TestStateful(unittest.TestCase):
             encoder.encode(char)
             for char in self.text)
         self.assertEqual(output, self.expected)
+        self.assertEqual(encoder.encode('', final=True), self.reset)
+        self.assertEqual(encoder.encode('', final=True), b'')
 
     def test_incrementalencoder_final(self):
         encoder = codecs.getincrementalencoder(self.encoding)()
@@ -279,12 +282,14 @@ class TestStateful(unittest.TestCase):
             encoder.encode(char, index == last_index)
             for index, char in enumerate(self.text))
         self.assertEqual(output, self.expected_reset)
+        self.assertEqual(encoder.encode('', final=True), b'')
 
 class TestHZStateful(TestStateful):
     text = '\u804a\u804a'
     encoding = 'hz'
     expected = b'~{ADAD'
-    expected_reset = b'~{ADAD~}'
+    reset = b'~}'
+    expected_reset = expected + reset
 
 def test_main():
     support.run_unittest(__name__)
-- 
cgit v1.2.1


From 8e1ebfa3d3fb1d4bce745b83770aaa4ec90b9bad Mon Sep 17 00:00:00 2001
From: Ezio Melotti <devnull@localhost>
Date: Tue, 4 Oct 2011 19:06:00 +0300
Subject: #13054: fix usage of sys.maxunicode after PEP-393.

---
 Lib/test/test_multibytecodec.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'Lib/test/test_multibytecodec.py')

diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py
index 44480723ba..feb7bd595a 100644
--- a/Lib/test/test_multibytecodec.py
+++ b/Lib/test/test_multibytecodec.py
@@ -247,14 +247,9 @@ class Test_ISO2022(unittest.TestCase):
             self.assertFalse(any(x > 0x80 for x in e))
 
     def test_bug1572832(self):
-        if sys.maxunicode >= 0x10000:
-            myunichr = chr
-        else:
-            myunichr = lambda x: chr(0xD7C0+(x>>10)) + chr(0xDC00+(x&0x3FF))
-
         for x in range(0x10000, 0x110000):
             # Any ISO 2022 codec will cause the segfault
-            myunichr(x).encode('iso_2022_jp', 'ignore')
+            chr(x).encode('iso_2022_jp', 'ignore')
 
 class TestStateful(unittest.TestCase):
     text = '\u4E16\u4E16'
-- 
cgit v1.2.1