mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

gh-130907: Treat all module-level annotations as conditional (#131550)

Browse source
This commit is contained in:
Jelle Zijlstra 2025-04-28 06:10:28 -07:00 • committed by GitHub
parent 5bf0f3666e
commit 922049b613
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 221 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Objects/moduleobject.c
View file

@ -1246,6 +1246,25 @@ module_get_annotations(PyObject *self, void *Py_UNUSED(ignored))
PyObject *annotations;
if (PyDict_GetItemRef(dict, &_Py_ID(__annotations__), &annotations) == 0) {
PyObject *spec;
if (PyDict_GetItemRef(m->md_dict, &_Py_ID(__spec__), &spec) < 0) {
Py_DECREF(dict);
return NULL;
}
bool is_initializing = false;
if (spec != NULL) {
int rc = _PyModuleSpec_IsInitializing(spec);
if (rc < 0) {
Py_DECREF(spec);
Py_DECREF(dict);
return NULL;
}
Py_DECREF(spec);
if (rc) {
is_initializing = true;
}
}
PyObject *annotate;
int annotate_result = PyDict_GetItemRef(dict, &_Py_ID(__annotate__), &annotate);
if (annotate_result < 0) {
@ -1273,7 +1292,8 @@ module_get_annotations(PyObject *self, void *Py_UNUSED(ignored))
annotations = PyDict_New();
}
Py_XDECREF(annotate);
if (annotations) {
// Do not cache annotations if the module is still initializing
if (annotations && !is_initializing) {
int result = PyDict_SetItem(
dict, &_Py_ID(__annotations__), annotations);
if (result) {