Skip to content

Commit 6609c09

Browse files
committed
Remove aliases for codecs we don't have
1 parent 2c44cae commit 6609c09

File tree

2 files changed

+33
-16
lines changed

2 files changed

+33
-16
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019, 2024, Oracle and/or its affiliates.
1+
# Copyright (c) 2019, 2025, Oracle and/or its affiliates.
22
# Copyright (C) 1996-2017 Python Software Foundation
33
#
44
# Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -28,6 +28,16 @@ def test_import():
2828
imported = False
2929
assert imported
3030

31+
def test_no_aliases_to_missing_codecs():
32+
from encodings.aliases import aliases
33+
34+
# This is how charset-normalizer discovers all encodings, we need to make sure they are importable
35+
for a in set(aliases.values()) - {"rot_13", "tactis", "mbcs"}:
36+
try:
37+
exec(f"import encodings.{a}")
38+
except Exception:
39+
raise AssertionError(f"Cannot import encodings.{a}, it should be fixed or removed from encodings.aliases")
40+
3141

3242
def test_decode():
3343
import codecs

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

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,14 @@
220220
'ms950' : 'cp950',
221221

222222
# euc_jis_2004 codec
223-
'jisx0213' : 'euc_jis_2004',
224-
'eucjis2004' : 'euc_jis_2004',
225-
'euc_jis2004' : 'euc_jis_2004',
223+
# GraalPy change: Java doesn't have this codec
224+
# 'jisx0213' : 'euc_jis_2004',
225+
# 'eucjis2004' : 'euc_jis_2004',
226+
# 'euc_jis2004' : 'euc_jis_2004',
226227

227228
# euc_jisx0213 codec
228-
'eucjisx0213' : 'euc_jisx0213',
229+
# GraalPy change: Java doesn't have this codec
230+
# 'eucjisx0213' : 'euc_jisx0213',
229231

230232
# euc_jp codec
231233
'eucjp' : 'euc_jp',
@@ -280,24 +282,28 @@
280282
'iso_2022_jp' : 'iso2022_jp',
281283

282284
# iso2022_jp_1 codec
283-
'iso2022jp_1' : 'iso2022_jp_1',
284-
'iso_2022_jp_1' : 'iso2022_jp_1',
285+
# GraalPy change: Java doesn't have this codec
286+
# 'iso2022jp_1' : 'iso2022_jp_1',
287+
# 'iso_2022_jp_1' : 'iso2022_jp_1',
285288

286289
# iso2022_jp_2 codec
287290
'iso2022jp_2' : 'iso2022_jp_2',
288291
'iso_2022_jp_2' : 'iso2022_jp_2',
289292

290293
# iso2022_jp_2004 codec
291-
'iso_2022_jp_2004' : 'iso2022_jp_2004',
292-
'iso2022jp_2004' : 'iso2022_jp_2004',
294+
# GraalPy change: Java doesn't have this codec
295+
# 'iso_2022_jp_2004' : 'iso2022_jp_2004',
296+
# 'iso2022jp_2004' : 'iso2022_jp_2004',
293297

294298
# iso2022_jp_3 codec
295-
'iso2022jp_3' : 'iso2022_jp_3',
296-
'iso_2022_jp_3' : 'iso2022_jp_3',
299+
# GraalPy change: Java doesn't have this codec
300+
# 'iso2022jp_3' : 'iso2022_jp_3',
301+
# 'iso_2022_jp_3' : 'iso2022_jp_3',
297302

298303
# iso2022_jp_ext codec
299-
'iso2022jp_ext' : 'iso2022_jp_ext',
300-
'iso_2022_jp_ext' : 'iso2022_jp_ext',
304+
# GraalPy change: Java doesn't have this codec
305+
# 'iso2022jp_ext' : 'iso2022_jp_ext',
306+
# 'iso_2022_jp_ext' : 'iso2022_jp_ext',
301307

302308
# iso2022_kr codec
303309
'csiso2022kr' : 'iso2022_kr',
@@ -485,9 +491,10 @@
485491
's_jis' : 'shift_jis',
486492

487493
# shift_jis_2004 codec
488-
'shiftjis2004' : 'shift_jis_2004',
489-
'sjis_2004' : 'shift_jis_2004',
490-
's_jis_2004' : 'shift_jis_2004',
494+
# GraalPy change: Java doesn't have this codec
495+
# 'shiftjis2004' : 'shift_jis_2004',
496+
# 'sjis_2004' : 'shift_jis_2004',
497+
# 's_jis_2004' : 'shift_jis_2004',
491498

492499
# shift_jisx0213 codec
493500
'shiftjisx0213' : 'shift_jisx0213',

0 commit comments

Comments
 (0)