fixed headers

blhsing · Jul 11, 2024 · 362e0ac · 362e0ac
1 parent aa2d9b4
commit 362e0ac
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -151,6 +151,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__len__)
         STRUCT_FOR_ID(__length_hint__)
         STRUCT_FOR_ID(__lltrace__)
+        STRUCT_FOR_ID(__loader__)
         STRUCT_FOR_ID(__lshift__)
         STRUCT_FOR_ID(__lt__)
         STRUCT_FOR_ID(__main__)

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -65,16 +65,16 @@ module_init_dict(PyModuleObject *mod, PyObject *md_dict,
     int r;
 
 #define _Py_MODULE_INIT_SETATTR(name, value) \
-    _Py_DICT_OR_MAPPING_SETITEM(md_dict, &_Py_ID(name), value, r) \
+    _Py_DICT_OR_MAPPING_SETITEM(md_dict, name, value, r) \
     if (r != 0) { \
         return -1; \
     }
 
-    _Py_MODULE_INIT_SETATTR(__name__, name)
-    _Py_MODULE_INIT_SETATTR(__doc__, doc)
-    _Py_MODULE_INIT_SETATTR(__package__, Py_None)
-    _Py_MODULE_INIT_SETATTR(__loader__, Py_None)
-    _Py_MODULE_INIT_SETATTR(__spec__, Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__name__), name)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__doc__), doc)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__package__), Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__loader__), Py_None)
+    _Py_MODULE_INIT_SETATTR(&_Py_ID(__spec__), Py_None)
     if (PyUnicode_CheckExact(name)) {
         Py_XSETREF(mod->md_name, Py_NewRef(name));
     }

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -387,7 +387,7 @@ set_main_loader(PyObject *d, PyObject *filename, const char *loader_name)
         return -1;
     }
 
-    if (PyDict_SetItemString(d, "__loader__", loader) < 0) {
+    if (PyDict_SetItem(d, &_Py_ID(__loader__), loader) < 0) {
         Py_DECREF(loader);
         return -1;
     }