py/builtinimport: Change relative import's ValueError to ImportError.

dpgeorge · dpgeorge · commit 53519e322a5a · 2021-05-30T19:35:03.000+10:00
Following CPython change, see https://bugs.python.org/issue37444. Signed-off-by: Damien George <damien@micropython.org>
diff --git a/py/builtinimport.c b/py/builtinimport.c
@@ -313,7 +313,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
         // We must have some component left over to import from
         if (p == this_name) {
-            mp_raise_ValueError(MP_ERROR_TEXT("can't perform relative import"));
+            mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));
         }
 
         uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
diff --git a/tests/import/import_pkg7.py.exp b/tests/import/import_pkg7.py.exp
@@ -0,0 +1,8 @@
+pkg __name__: pkg7
+pkg __name__: pkg7.subpkg1
+pkg __name__: pkg7.subpkg1.subpkg2
+mod1
+mod2
+mod1.foo
+mod2.bar
+ImportError
diff --git a/tests/import/pkg7/subpkg1/subpkg2/mod3.py b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
@@ -7,5 +7,5 @@
 # attempted relative import beyond top-level package
 try:
     from .... import mod1
-except ValueError:
-    print("ValueError")
+except ImportError:
+    print("ImportError")

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {`
`313`	`313`
`314`	`314`	`// We must have some component left over to import from`
`315`	`315`	`if (p == this_name) {`
`316`		`- mp_raise_ValueError(MP_ERROR_TEXT("can't perform relative import"));`
	`316`	`+ mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);`