summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2021-10-23-13-49-00.bpo-45379.ZF7G3n.rst2
-rw-r--r--Python/import.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-10-23-13-49-00.bpo-45379.ZF7G3n.rst b/Misc/NEWS.d/next/Core and Builtins/2021-10-23-13-49-00.bpo-45379.ZF7G3n.rst
new file mode 100644
index 0000000..f8e2e50
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-10-23-13-49-00.bpo-45379.ZF7G3n.rst
@@ -0,0 +1,2 @@
+Clarify :exc:`ImportError` message when we try to explicitly import a
+frozen module but frozen modules are disabled.
diff --git a/Python/import.c b/Python/import.c
index fe4686c..15b1956 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1153,9 +1153,11 @@ set_frozen_error(frozen_status status, PyObject *modname)
switch (status) {
case FROZEN_BAD_NAME:
case FROZEN_NOT_FOUND:
- case FROZEN_DISABLED:
err = "No such frozen object named %R";
break;
+ case FROZEN_DISABLED:
+ err = "Frozen modules are disabled and the frozen object named %R is not essential";
+ break;
case FROZEN_EXCLUDED:
err = "Excluded frozen object named %R";
break;