Skip to content

bpo-43901: Lazy-create an empty annotations dict in all unannotated user classes and modules #25623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
larryhastings merged 9 commits into from
Apr 30, 2021
Merged

bpo-43901: Lazy-create an empty annotations dict in all unannotated user classes and modules #25623

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7c66fc5
Change module object to lazy-create annotations.
larryhastings Apr 26, 2021
91752e9
Change class object to lazy-create annotations.
larryhastings Apr 26, 2021
da2e6bd
Add news blurb.
larryhastings Apr 26, 2021
4a5d431
Don't bother raising if PyModule_GetName() fails.
larryhastings Apr 27, 2021
df7deea
Unit tests for lazy module annotations dicts.
larryhastings Apr 27, 2021
4cd0d92
Add unit tests for lazy user class annotations.
larryhastings Apr 27, 2021
c139021
Fix pydoc.
larryhastings Apr 27, 2021
f36d27c
Test that cls.__annotations__ descriptor works.
larryhastings Apr 27, 2021
bdf09ac
Fix important missing whitespace in important test.
larryhastings Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't bother raising if PyModule_GetName() fails. 
I copied some code from module_dir into module_{get|set}_annotations().
It seemed like it had a minor flaw: if the module dict failed a
PyDict_Check(), it wanted to raise an exception.  But to raise the
exception, it wanted the name of the module, and if getting the name
failed it skipped raising the exception.  It turns out, if getting
the name of the module fails, *that* raises an exception too.  So,
rather than stomp on that exception, we should do the same thing
module_dir() does: leave that exception alone and return an error.
  • Loading branch information
@larryhastings
larryhastings committed Apr 27, 2021
commit 4a5d431b6b165e5d3392a78471930af516f08154
16 changes: 7 additions & 9 deletions Objects/moduleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,12 +849,11 @@ module_get_annotations(PyModuleObject *m, void *Py_UNUSED(ignored))

if (dict == NULL) {
const char *name = PyModule_GetName((PyObject *)m);
if (!name) {
name = "<module>";
}
PyErr_Format(PyExc_TypeError,
if (name) {
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ is not a dictionary",
name);
}
return NULL;
}

Expand Down Expand Up @@ -890,12 +889,11 @@ module_set_annotations(PyModuleObject *m, PyObject *value, void *Py_UNUSED(ignor

if (dict == NULL) {
const char *name = PyModule_GetName((PyObject *)m);
if (!name) {
name = "<module>";
if (name) {
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ is not a dictionary",
name);
}
PyErr_Format(PyExc_TypeError,
"%.200s.__dict__ is not a dictionary",
name);
return -1;
}

Expand Down