Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-38026: fix inspect.getattr_static (GH-15676) 

It should avoid dynamic lookup including `isinstance`.

This is a regression caused by GH-5351.
This commit is contained in:
Inada Naoki 2019-09-05 13:07:08 +09:00 committed by GitHub
parent 2cd9025858
commit 8f9cc8771f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/inspect.py
View File

@ -1558,7 +1558,7 @@ def _shadowed_dict(klass):
except KeyError:
pass
else:
if not (isinstance(class_dict, types.GetSetDescriptorType) and
if not (type(class_dict) is types.GetSetDescriptorType and
class_dict.__name__ == "__dict__" and
class_dict.__objclass__ is entry):
return class_dict
@ -1580,7 +1580,7 @@ def getattr_static(obj, attr, default=_sentinel):
klass = type(obj)
dict_attr = _shadowed_dict(klass)
if (dict_attr is _sentinel or
isinstance(dict_attr, types.MemberDescriptorType)):
type(dict_attr) is types.MemberDescriptorType):
instance_result = _check_instance(obj, attr)
else:
klass = obj

2
Misc/NEWS.d/next/Library/2019-09-04-20-34-14.bpo-38026.0LLRX-.rst Normal file
View File

@ -0,0 +1,2 @@
Fixed :func:`inspect.getattr_static` used ``isinstance`` while it should
avoid dynamic lookup.