From 19ecd153d1337f94bcda9502827c67985c578c05 Mon Sep 17 00:00:00 2001 From: Jonathan Dung Date: Wed, 27 May 2026 17:52:02 +0800 Subject: [PATCH 1/2] commit --- Doc/library/inspect.rst | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 3ca63d1d026135c..b48cd38cfc17e79 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -1669,19 +1669,13 @@ You can handle these with code like the following. Note that for arbitrary getset descriptors invoking these may trigger code execution:: - # example code for resolving the builtin descriptor types - class _foo: - __slots__ = ['foo'] - - slot_descriptor = type(_foo.foo) - getset_descriptor = type(type(open(__file__)).name) - wrapper_descriptor = type(str.__dict__['__add__']) - descriptor_types = (slot_descriptor, getset_descriptor, wrapper_descriptor) + import types + descriptor_types = (types.MemberDescriptorType, types.GetSetDescriptorType, types.WrapperDescriptorType) result = getattr_static(some_object, 'foo') - if type(result) in descriptor_types: + if isinstance(result, descriptor_types): try: - result = result.__get__() + result = result.__get__(some_object) except AttributeError: # descriptors can raise AttributeError to # indicate there is no underlying value From 51357b8ae7417313fac3515d213dfcdf3e52c522 Mon Sep 17 00:00:00 2001 From: Jonathan Dung Date: Sun, 5 Jul 2026 17:11:38 +0800 Subject: [PATCH 2/2] fix --- Doc/library/inspect.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index b48cd38cfc17e79..8b0903a0a20147f 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -1670,10 +1670,9 @@ for arbitrary getset descriptors invoking these may trigger code execution:: import types - descriptor_types = (types.MemberDescriptorType, types.GetSetDescriptorType, types.WrapperDescriptorType) result = getattr_static(some_object, 'foo') - if isinstance(result, descriptor_types): + if isinstance(result, (types.MemberDescriptorType, types.GetSetDescriptorType, types.WrapperDescriptorType)): try: result = result.__get__(some_object) except AttributeError: