Update error messages

Author: vstinner

Python/_warnings.c

@@ -1271,8 +1271,9 @@ warnings_warn_explicit_impl(PyObject *module, PyObject *message,
     if (module_globals && module_globals != Py_None) {
         if (!PyAnyDict_Check(module_globals)) {
             PyErr_Format(PyExc_TypeError,
-                         "module_globals must be a dict, not '%.200s'",
-                         Py_TYPE(module_globals)->tp_name);
+                         "module_globals must be a dict or a frozendict, "
+                         "not %T",
+                         module_globals);
             return NULL;
         }
 

Python/import.c

@@ -3729,7 +3729,8 @@ resolve_name(PyThreadState *tstate, PyObject *name, PyObject *globals, int level
         goto error;
     }
     if (!PyAnyDict_Check(globals)) {
-        _PyErr_SetString(tstate, PyExc_TypeError, "globals must be a dict");
+        _PyErr_SetString(tstate, PyExc_TypeError,
+                         "globals must be a dict or a frozendict");
         goto error;
     }
     if (PyDict_GetItemRef(globals, &_Py_ID(__package__), &package) < 0) {

Python/pythonrun.c

@@ -1348,7 +1348,8 @@ run_eval_code_obj(PyThreadState *tstate, PyCodeObject *co, PyObject *globals, Py
 {
     /* Set globals['__builtins__'] if it doesn't exist */
     if (!globals || !PyAnyDict_Check(globals)) {
-        PyErr_SetString(PyExc_SystemError, "globals must be a real dict");
+        PyErr_SetString(PyExc_SystemError,
+                        "globals must be a real dict or a real frozendict");
         return NULL;
     }
     int has_builtins = PyDict_ContainsString(globals, "__builtins__");