Skip to content

gh-119180: Fix annotations lookup on classes with custom metaclasses #120719

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

Closed
JelleZijlstra wants to merge 12 commits into from
Closed

gh-119180: Fix annotations lookup on classes with custom metaclasses #120719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6f71f30
gh-119180: Fix annotations lookup on classes with custom metaclasses
JelleZijlstra Jun 19, 2024
e468ce7
basic annotations descriptor
JelleZijlstra Jun 19, 2024
dfcb071
Expand prototype
JelleZijlstra Jun 19, 2024
1f1ec57
Merge remote-tracking branch 'upstream/main' into pep649-meta
JelleZijlstra Jun 20, 2024
c0a2668
add get/set
JelleZijlstra Jun 21, 2024
7f9d3ee
Merge remote-tracking branch 'upstream/main' into pep649-meta
JelleZijlstra Jun 21, 2024
20fb144
no more __annotations_cache__
JelleZijlstra Jun 21, 2024
832f6f3
Don't add __set__
JelleZijlstra Jun 21, 2024
1d3abff
fix leak
JelleZijlstra Jun 21, 2024
9969e99
fix test_descr
JelleZijlstra Jun 21, 2024
b845c0e
fix tests
JelleZijlstra Jun 21, 2024
73eb018
fix smelly
JelleZijlstra Jun 21, 2024
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 add __set__
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Jun 21, 2024
commit 832f6f324704205552c2aefb3c3cbd9ff6973869
5 changes: 0 additions & 5 deletions Lib/test/test_type_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@
class TypeAnnotationTests(unittest.TestCase):

def test_lazy_create_annotations(self):
# type objects lazy create their __annotations__ dict on demand.
# the annotations dict is stored in type.__dict__.
# a freshly created type shouldn't have an annotations dict yet.
foo = type("Foo", (), {})
for i in range(3):
self.assertFalse("__annotations__" in foo.__dict__)
d = foo.__annotations__
self.assertTrue("__annotations__" in foo.__dict__)
self.assertEqual(foo.__annotations__, d)
Expand All @@ -27,7 +23,6 @@ def test_lazy_create_annotations(self):
def test_setting_annotations(self):
foo = type("Foo", (), {})
for i in range(3):
self.assertFalse("__annotations__" in foo.__dict__)
d = {'a': int}
foo.__annotations__ = d
self.assertTrue("__annotations__" in foo.__dict__)
Expand Down
13 changes: 0 additions & 13 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11899,18 +11899,6 @@ annodescr_descr_get(PyObject *self, PyObject *obj, PyObject *type)
return Py_NewRef(ad->annotations);
}

static int
annodescr_descr_set(PyObject *self, PyObject *obj, PyObject *value)
{
annodescrobject *ad = (annodescrobject *)self;
if (value == NULL) {
PyErr_SetString(PyExc_TypeError, "cannot delete __annotations__");
return -1;
}
Py_XSETREF(ad->annotations, value);
return 0;
}

PyTypeObject _PyAnnotationsDescriptor_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "AnnotationsDescriptor",
Expand All @@ -11933,5 +11921,4 @@ PyTypeObject _PyAnnotationsDescriptor_Type = {
.tp_richcompare = annodescr_richcompare,
.tp_methods = annodescr_methods,
.tp_descr_get = annodescr_descr_get,
.tp_descr_set = annodescr_descr_set,
};