Align multibyte codec aliases with actual JDK support

Map shift_jis_2004 to the JDK charset name that actually exists, x-SJIS_0213, and stop advertising EUC/ISO-2022 Japanese codec aliases that still have no backing Java charset. This keeps encodings.aliases and CharsetMapping consistent with real runtime support, restores shift_jis_2004 for callers like charset-normalizer and requests, and preserves ImportError behavior for the codecs that remain unsupported.

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_codecs.py

@@ -3,6 +3,7 @@
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 import importlib
+import importlib.util
 import sys
 from pathlib import Path
 
@@ -909,7 +910,6 @@ def test_unsupported_multibyte_codec_modules_raise_import_error_on_graalpy(self)
             'encodings.iso2022_jp_2004',
             'encodings.iso2022_jp_3',
             'encodings.iso2022_jp_ext',
-            'encodings.shift_jis_2004',
         ):
             with self.subTest(module_name=module_name):
                 module_path = encodings_dir / f'{module_name.rsplit(".", 1)[1]}.py'
@@ -920,6 +920,9 @@ def test_unsupported_multibyte_codec_modules_raise_import_error_on_graalpy(self)
                 else:
                     spec.loader.exec_module(module)
 
+    def test_shift_jis_2004_codec_module_imports(self):
+        import encodings.shift_jis_2004
+
     # just a smoke test
     def test_encode(self):
         import _codecs_tw

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java

@@ -306,7 +306,7 @@ private static void addAlias(String alias, String pythonName) {
         addMapping("mac_turkish", "x-MacTurkish");
         addMapping("palmos", null);
         addMapping("ptcp154", null);
-        addMapping("shift_jis_2004", "Shift_JISX0213");
+        addMapping("shift_jis_2004", "x-SJIS_0213");
         addMapping("shift_jis", "Shift_JIS");
         addMapping("shift_jisx0213", "x-SJIS_0213");
         addMapping("utf_16_be", "UTF-16BE");
@@ -438,10 +438,6 @@ private static void addAlias(String alias, String pythonName) {
         addAlias("uhc", "cp949");
         addAlias("950", "cp950");
         addAlias("ms950", "cp950");
-        addAlias("jisx0213", "euc_jis_2004");
-        addAlias("eucjis2004", "euc_jis_2004");
-        addAlias("euc_jis2004", "euc_jis_2004");
-        addAlias("eucjisx0213", "euc_jisx0213");
         addAlias("eucjp", "euc_jp");
         addAlias("ujis", "euc_jp");
         addAlias("u_jis", "euc_jp");

graalpython/lib-python/3/encodings/aliases.py

@@ -491,10 +491,9 @@
     's_jis'              : 'shift_jis',
 
     # shift_jis_2004 codec
-    # GraalPy change: Java doesn't have this codec
-    # 'shiftjis2004'       : 'shift_jis_2004',
-    # 'sjis_2004'          : 'shift_jis_2004',
-    # 's_jis_2004'         : 'shift_jis_2004',
+    'shiftjis2004'       : 'shift_jis_2004',
+    'sjis_2004'          : 'shift_jis_2004',
+    's_jis_2004'         : 'shift_jis_2004',
 
     # shift_jisx0213 codec
     'shiftjisx0213'      : 'shift_jisx0213',