gh-140550: Correct error message for PyModExport (PEP 793) hook (GH-142583)

encukou · web-flow · commit 15313dd3d744 · 2025-12-12T17:48:43.000+01:00
diff --git a/Python/import.c b/Python/import.c
@@ -2003,15 +2003,15 @@ import_run_modexport(PyThreadState *tstate, PyModExportFunction ex0,
         if (!PyErr_Occurred()) {
             PyErr_Format(
                 PyExc_SystemError,
-                "slot export function for module %s failed without setting an exception",
+                "module export hook for module %R failed without setting an exception",
                 info->name);
         }
         return NULL;
     }
     if (PyErr_Occurred()) {
         PyErr_Format(
             PyExc_SystemError,
-            "slot export function for module %s raised unreported exception",
+            "module export hook for module %R raised unreported exception",
             info->name);
     }
     PyObject *result = PyModule_FromSlotsAndSpec(slots, spec);

Original file line number	Diff line number	Diff line change
`@@ -2003,15 +2003,15 @@ import_run_modexport(PyThreadState *tstate, PyModExportFunction ex0,`
`2003`	`2003`	`if (!PyErr_Occurred()) {`
`2004`	`2004`	`PyErr_Format(`
`2005`	`2005`	`PyExc_SystemError,`
`2006`		`- "slot export function for module %s failed without setting an exception",`
	`2006`	`+ "module export hook for module %R failed without setting an exception",`
`2007`	`2007`	`info->name);`
`2008`	`2008`	`}`
`2009`	`2009`	`return NULL;`
`2010`	`2010`	`}`
`2011`	`2011`	`if (PyErr_Occurred()) {`
`2012`	`2012`	`PyErr_Format(`
`2013`	`2013`	`PyExc_SystemError,`
`2014`		`- "slot export function for module %s raised unreported exception",`
	`2014`	`+ "module export hook for module %R raised unreported exception",`
`2015`	`2015`	`info->name);`
`2016`	`2016`	`}`
`2017`	`2017`	`PyObject *result = PyModule_FromSlotsAndSpec(slots, spec);`