[GR-24106] Implement codecs for all Java-supported encodings

msimacek · msimacek · commit 61c4aebf3e4d · 2020-06-15T09:01:33.000Z
PullRequest: graalpython/1022
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,5 @@ Python3.g4.stamp
 *.jfr
 
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/antlr/.antlr/
+graalpython/lib-python/3/test/data
+!graalpython/lib-python/3/test/data/README
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_imports.py b/graalpython/com.oracle.graal.python.test/src/tests/test_imports.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -145,9 +145,6 @@ def test_imp_cached_imports():
         spec = finder.find_spec("encodings", None)
         assert spec.submodule_search_locations
 
-        spec = finder.find_spec("encodings.utf_8", None)
-        assert not spec.submodule_search_locations
-
 
 def test_import_package_all() :
     import package1
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_cn.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_cn.txt
@@ -0,0 +1,15 @@
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_customreplace_encode
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB18030.test_xmlcharrefreplace
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB2312.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB2312.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB2312.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GB2312.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_GBK.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_cn.Test_HZ.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_hk.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_hk.txt
@@ -0,0 +1 @@
+*graalpython.lib-python.3.test.test_codecencodings_hk.Test_Big5HKSCS.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_iso2022.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_iso2022.txt
@@ -1 +1,6 @@
+*graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_JP.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_JP.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_JP2.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_JP2.test_streamwriter_reset_no_pending
 *graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_KR.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_iso2022.Test_ISO2022_KR.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_jp.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_jp.txt
@@ -0,0 +1,13 @@
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_CP932.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_CP932.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_CP932.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_CP932.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_EUC_JP_COMPAT.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_EUC_JP_COMPAT.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_EUC_JP_COMPAT.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_EUC_JP_COMPAT.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_SJISX0213.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_SJIS_COMPAT.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_SJIS_COMPAT.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_SJIS_COMPAT.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_jp.Test_SJIS_COMPAT.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_kr.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_kr.txt
@@ -0,0 +1,6 @@
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_CP949.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_EUCKR.test_streamwriter_reset_no_pending
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_JOHAB.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_JOHAB.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_JOHAB.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_kr.Test_JOHAB.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_tw.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecencodings_tw.txt
@@ -0,0 +1,4 @@
+*graalpython.lib-python.3.test.test_codecencodings_tw.Test_Big5.test_chunkcoding
+*graalpython.lib-python.3.test.test_codecencodings_tw.Test_Big5.test_incrementalencoder
+*graalpython.lib-python.3.test.test_codecencodings_tw.Test_Big5.test_streamwriter
+*graalpython.lib-python.3.test.test_codecencodings_tw.Test_Big5.test_streamwriter_reset_no_pending
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_cn.txt
@@ -1,6 +1,7 @@
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGB18030Map.test_errorhandle
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGB18030Map.test_mapping_supplemental
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGB2312Map.test_errorhandle
+*graalpython.lib-python.3.test.test_codecmaps_cn.TestGB2312Map.test_mapping_file
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGB2312Map.test_mapping_supplemental
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGBKMap.test_errorhandle
 *graalpython.lib-python.3.test.test_codecmaps_cn.TestGBKMap.test_mapping_supplemental
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_kr.txt
@@ -1,6 +1,8 @@
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestCP949Map.test_errorhandle
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestCP949Map.test_mapping_supplemental
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestEUCKRMap.test_errorhandle
+*graalpython.lib-python.3.test.test_codecmaps_kr.TestEUCKRMap.test_mapping_file
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestEUCKRMap.test_mapping_supplemental
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestJOHABMap.test_errorhandle
+*graalpython.lib-python.3.test.test_codecmaps_kr.TestJOHABMap.test_mapping_file
 *graalpython.lib-python.3.test.test_codecmaps_kr.TestJOHABMap.test_mapping_supplemental
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_codecmaps_tw.txt
@@ -1,3 +1,4 @@
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_errorhandle
+*graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_file
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestBIG5Map.test_mapping_supplemental
 *graalpython.lib-python.3.test.test_codecmaps_tw.TestCP950Map.test_mapping_supplemental
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -50,6 +50,7 @@
 import com.oracle.graal.python.builtins.modules.BuiltinFunctions;
 import com.oracle.graal.python.builtins.modules.CmathModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.CodecsModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.CodecsTruffleModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.CollectionsModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ContextvarsModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.CtypesModuleBuiltins;
@@ -237,6 +238,7 @@ private static final String[] initializeCoreFiles() {
                         "memoryview",
                         "list",
                         "_codecs",
+                        "_codecs_truffle",
                         "bytes",
                         "bytearray",
                         "time",
@@ -372,6 +374,7 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new FunctoolsModuleBuiltins(),
                         new ErrnoModuleBuiltins(),
                         new CodecsModuleBuiltins(),
+                        new CodecsTruffleModuleBuiltins(),
                         new CollectionsModuleBuiltins(),
                         new JavaModuleBuiltins(),
                         new SREModuleBuiltins(),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java
@@ -53,9 +53,7 @@
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
@@ -82,6 +80,7 @@
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNodeGen;
 import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.util.CharsetMapping;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -98,152 +97,6 @@
 public class CodecsModuleBuiltins extends PythonBuiltins {
     private static final Charset UTF32 = Charset.forName("utf-32");
 
-    // python to java codecs mapping
-    private static final Map<String, Charset> CHARSET_MAP = new HashMap<>();
-    static {
-        // ascii
-        CHARSET_MAP.put("us-ascii", StandardCharsets.US_ASCII);
-        CHARSET_MAP.put("ascii", StandardCharsets.US_ASCII);
-        CHARSET_MAP.put("646", StandardCharsets.US_ASCII);
-
-        // latin 1
-        CHARSET_MAP.put("iso-8859-1", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("latin-1", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("latin_1", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("iso8859-1", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("8859", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("cp819", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("latin", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("latin1", StandardCharsets.ISO_8859_1);
-        CHARSET_MAP.put("L1", StandardCharsets.ISO_8859_1);
-
-        // utf-8
-        CHARSET_MAP.put("UTF-8", StandardCharsets.UTF_8);
-        CHARSET_MAP.put("utf-8", StandardCharsets.UTF_8);
-        CHARSET_MAP.put("utf_8", StandardCharsets.UTF_8);
-        CHARSET_MAP.put("U8", StandardCharsets.UTF_8);
-        CHARSET_MAP.put("UTF", StandardCharsets.UTF_8);
-        CHARSET_MAP.put("utf8", StandardCharsets.UTF_8);
-
-        // utf-16
-        CHARSET_MAP.put("utf-16", StandardCharsets.UTF_16);
-        CHARSET_MAP.put("utf_16", StandardCharsets.UTF_16);
-        CHARSET_MAP.put("U16", StandardCharsets.UTF_16);
-        CHARSET_MAP.put("utf16", StandardCharsets.UTF_16);
-        // TODO BMP only
-        CHARSET_MAP.put("utf_16_be", StandardCharsets.UTF_16BE);
-        CHARSET_MAP.put("utf_16_le", StandardCharsets.UTF_16LE);
-
-        // utf-32
-        final Charset utf32be = Charset.forName("utf-32be");
-        final Charset utf32le = Charset.forName("utf-32le");
-        final Charset ibm437 = Charset.forName("IBM437");
-
-        CHARSET_MAP.put("utf-32", UTF32);
-        CHARSET_MAP.put("utf_32", UTF32);
-        CHARSET_MAP.put("U32", UTF32);
-        CHARSET_MAP.put("utf-32be", utf32be);
-        CHARSET_MAP.put("utf_32_be", utf32be);
-        CHARSET_MAP.put("utf-32le", utf32le);
-        CHARSET_MAP.put("utf_32_le", utf32le);
-        CHARSET_MAP.put("utf32", UTF32);
-        // big5 big5-tw, csbig5 Traditional Chinese
-        // big5hkscs big5-hkscs, hkscs Traditional Chinese
-        // cp037 IBM037, IBM039 English
-        // cp424 EBCDIC-CP-HE, IBM424 Hebrew
-        // cp437 437, IBM437 English
-        CHARSET_MAP.put("IBM437", ibm437);
-        CHARSET_MAP.put("IBM437 English", ibm437);
-        CHARSET_MAP.put("437", ibm437);
-        CHARSET_MAP.put("cp437", ibm437);
-        // cp500 EBCDIC-CP-BE, EBCDIC-CP-CH, IBM500 Western Europe
-        // cp720 Arabic
-        // cp737 Greek
-        // cp775 IBM775 Baltic languages
-        // cp850 850, IBM850 Western Europe
-        // cp852 852, IBM852 Central and Eastern Europe
-        // cp855 855, IBM855 Bulgarian, Byelorussian, Macedonian, Russian, Serbian
-        // cp856 Hebrew
-        // cp857 857, IBM857 Turkish
-        // cp858 858, IBM858 Western Europe
-        // cp860 860, IBM860 Portuguese
-        // cp861 861, CP-IS, IBM861 Icelandic
-        // cp862 862, IBM862 Hebrew
-        // cp863 863, IBM863 Canadian
-        // cp864 IBM864 Arabic
-        // cp865 865, IBM865 Danish, Norwegian
-        // cp866 866, IBM866 Russian
-        // cp869 869, CP-GR, IBM869 Greek
-        // cp874 Thai
-        // cp875 Greek
-        // cp932 932, ms932, mskanji, ms-kanji Japanese
-        // cp949 949, ms949, uhc Korean
-        // cp950 950, ms950 Traditional Chinese
-        // cp1006 Urdu
-        // cp1026 ibm1026 Turkish
-        // cp1140 ibm1140 Western Europe
-        // cp1250 windows-1250 Central and Eastern Europe
-        // cp1251 windows-1251 Bulgarian, Byelorussian, Macedonian, Russian, Serbian
-        // cp1252 windows-1252 Western Europe
-        // cp1253 windows-1253 Greek
-        // cp1254 windows-1254 Turkish
-        // cp1255 windows-1255 Hebrew
-        // cp1256 windows-1256 Arabic
-        // cp1257 windows-1257 Baltic languages
-        // cp1258 windows-1258 Vietnamese
-        // euc_jp eucjp, ujis, u-jis Japanese
-        // euc_jis_2004 jisx0213, eucjis2004 Japanese
-        // euc_jisx0213 eucjisx0213 Japanese
-        // euc_kr euckr, korean, ksc5601, ks_c-5601, ks_c-5601-1987, ksx1001, ks_x-1001 Korean
-        // gb2312 chinese, csiso58gb231280, euc- cn, euccn, eucgb2312-cn, gb2312-1980, gb2312-80,
-        // iso- ir-58 Simplified Chinese
-        // gbk 936, cp936, ms936 Unified Chinese
-        // gb18030 gb18030-2000 Unified Chinese
-        // hz hzgb, hz-gb, hz-gb-2312 Simplified Chinese
-        // iso2022_jp csiso2022jp, iso2022jp, iso-2022-jp Japanese
-        // iso2022_jp_1 iso2022jp-1, iso-2022-jp-1 Japanese
-        // iso2022_jp_2 iso2022jp-2, iso-2022-jp-2 Japanese, Korean, Simplified Chinese, Western
-        // Europe, Greek
-        // iso2022_jp_2004 iso2022jp-2004, iso-2022-jp-2004 Japanese
-        // iso2022_jp_3 iso2022jp-3, iso-2022-jp-3 Japanese
-        // iso2022_jp_ext iso2022jp-ext, iso-2022-jp-ext Japanese
-        // iso2022_kr csiso2022kr, iso2022kr, iso-2022-kr Korean
-        // iso8859_2 iso-8859-2, latin2, L2 Central and Eastern Europe
-        // iso8859_3 iso-8859-3, latin3, L3 Esperanto, Maltese
-        // iso8859_4 iso-8859-4, latin4, L4 Baltic languages
-        // iso8859_5 iso-8859-5, cyrillic Bulgarian, Byelorussian, Macedonian, Russian, Serbian
-        // iso8859_6 iso-8859-6, arabic Arabic
-        // iso8859_7 iso-8859-7, greek, greek8 Greek
-        // iso8859_8 iso-8859-8, hebrew Hebrew
-        // iso8859_9 iso-8859-9, latin5, L5 Turkish
-        // iso8859_10 iso-8859-10, latin6, L6 Nordic languages
-        // iso8859_11 iso-8859-11, thai Thai languages
-        // iso8859_13 iso-8859-13, latin7, L7 Baltic languages
-        // iso8859_14 iso-8859-14, latin8, L8 Celtic languages
-        // iso8859_15 iso-8859-15, latin9, L9 Western Europe
-        // iso8859_16 iso-8859-16, latin10, L10 South-Eastern Europe
-        // johab cp1361, ms1361 Korean
-        // koi8_r Russian
-        // koi8_u Ukrainian
-        // mac_cyrillic maccyrillic Bulgarian, Byelorussian, Macedonian, Russian, Serbian
-        // mac_greek macgreek Greek
-        // mac_iceland maciceland Icelandic
-        // mac_latin2 maclatin2, maccentraleurope Central and Eastern Europe
-        // mac_roman macroman Western Europe
-        // mac_turkish macturkish Turkish
-        // ptcp154 csptcp154, pt154, cp154, cyrillic-asian Kazakh
-        // shift_jis csshiftjis, shiftjis, sjis, s_jis Japanese
-        // shift_jis_2004 shiftjis2004, sjis_2004, sjis2004 Japanese
-        // shift_jisx0213 shiftjisx0213, sjisx0213, s_jisx0213 Japanese
-        // utf_7 U7, unicode-1-1-utf-7 all languages
-        // utf_8_sig
-    }
-
-    @TruffleBoundary
-    static Charset getCharset(String encoding) {
-        return CHARSET_MAP.get(encoding);
-    }
-
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return CodecsModuleBuiltinsFactory.getFactories();
@@ -379,7 +232,7 @@ Object encode(Object str, @SuppressWarnings("unused") Object encoding, @Suppress
         @TruffleBoundary
         private PBytes encodeString(String self, String encoding, String errors) {
             CodingErrorAction errorAction = convertCodingErrorAction(errors);
-            Charset charset = getCharset(encoding);
+            Charset charset = CharsetMapping.getCharset(encoding);
             if (charset == null) {
                 throw raise(LookupError, ErrorMessages.UNKNOWN_ENCODING, encoding);
             }
@@ -503,7 +356,7 @@ private static ByteBuffer wrap(byte[] bytes) {
         @TruffleBoundary
         String decodeBytes(ByteBuffer byteBuffer, String encoding, String errors, boolean finalData) {
             CodingErrorAction errorAction = convertCodingErrorAction(errors);
-            Charset charset = getCharset(encoding);
+            Charset charset = CharsetMapping.getCharset(encoding);
             if (charset == null) {
                 throw raise(LookupError, ErrorMessages.UNKNOWN_ENCODING, encoding);
             }
@@ -625,7 +478,7 @@ abstract static class CodecsLookupNode extends PythonBuiltinNode {
         // This is replaced in the core _codecs.py with the full functionality
         @Specialization
         Object lookup(String encoding) {
-            if (getCharset(encoding) != null) {
+            if (CharsetMapping.getCharset(encoding) != null) {
                 return true;
             } else {
                 return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java
diff --git a/graalpython/lib-graalpython/_codecs.py b/graalpython/lib-graalpython/_codecs.py
diff --git a/graalpython/lib-graalpython/_codecs_truffle.py b/graalpython/lib-graalpython/_codecs_truffle.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+*graalpython.lib-python.3.test.test_codecencodings_hk.Test_Big5HKSCS.test_streamwriter_reset_no_pending`