Skip to content

Commit 1d8c3a4

Browse files
timfeltimfel
committed
Fix cjk codec import exception behavior: raise ImportError (not LookupError)
1 parent f4f181b commit 1d8c3a4

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsCNModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_CN;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -134,7 +135,7 @@ static Object getcodec(Object encoding,
134135

135136
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
136137
if (codec == null) {
137-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
138+
throw raiseNode.raise(inliningTarget, ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
138139
}
139140

140141
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsHKModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_HK;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -126,7 +127,7 @@ static Object getcodec(Object encoding,
126127

127128
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
128129
if (codec == null) {
129-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
130+
throw raiseNode.raise(inliningTarget, ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
130131
}
131132

132133
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsISO2022ModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_ISO2022;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -136,7 +137,7 @@ static Object getcodec(Object encoding,
136137

137138
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
138139
if (codec == null) {
139-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
140+
throw raiseNode.raise(inliningTarget, ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
140141
}
141142

142143
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsJPModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_JP;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -158,7 +159,7 @@ static Object getcodec(Object encoding,
158159

159160
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
160161
if (codec == null) {
161-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
162+
throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
162163
}
163164

164165
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsKRModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_KR;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -131,7 +132,7 @@ static Object getcodec(Object encoding,
131132

132133
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
133134
if (codec == null) {
134-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
135+
throw raiseNode.raise(inliningTarget, ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
135136
}
136137

137138
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/CodecsTWModuleBuiltins.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import static com.oracle.graal.python.nodes.BuiltinNames.T__CODECS_TW;
4949
import static com.oracle.graal.python.nodes.ErrorMessages.ENCODING_NAME_MUST_BE_A_STRING;
5050
import static com.oracle.graal.python.nodes.ErrorMessages.NO_SUCH_CODEC_IS_SUPPORTED;
51+
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ImportError;
5152
import static com.oracle.graal.python.runtime.exception.PythonErrorType.LookupError;
5253
import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
5354

@@ -126,7 +127,7 @@ static Object getcodec(Object encoding,
126127

127128
MultibyteCodec codec = findCodec(CODEC_LIST, asUTF8Node.execute(inliningTarget, encoding), isEqual);
128129
if (codec == null) {
129-
throw raiseNode.raise(inliningTarget, LookupError, NO_SUCH_CODEC_IS_SUPPORTED);
130+
throw raiseNode.raise(inliningTarget, ImportError, NO_SUCH_CODEC_IS_SUPPORTED);
130131
}
131132

132133
PyCapsule codecobj = PFactory.createCapsuleJavaName(language, codec, PyMultibyteCodec_CAPSULE_NAME);

0 commit comments

Comments
 (0)