mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge 3.2

Browse source
This commit is contained in:
Michael Foord 2011-12-18 22:09:27 +00:00
commit a699a2d0c1
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/inspect.py
View file

@ -1109,7 +1109,7 @@ def _check_instance(obj, attr):
def _check_class(klass, attr):
for entry in _static_getmro(klass):
if not _shadowed_dict(type(entry)):
if _shadowed_dict(type(entry)) is _sentinel:
try:
return entry.__dict__[attr]
except KeyError:
@ -1134,8 +1134,8 @@ def _shadowed_dict(klass):
if not (type(class_dict) is types.GetSetDescriptorType and
class_dict.__name__ == "__dict__" and
class_dict.__objclass__ is entry):
return True
return False
return class_dict
return _sentinel
def getattr_static(obj, attr, default=_sentinel):
"""Retrieve attributes without triggering dynamic lookup via the
@ -1151,7 +1151,9 @@ def getattr_static(obj, attr, default=_sentinel):
instance_result = _sentinel
if not _is_type(obj):
klass = type(obj)
if not _shadowed_dict(klass):
dict_attr = _shadowed_dict(klass)
if (dict_attr is _sentinel or
type(dict_attr) is types.MemberDescriptorType):
instance_result = _check_instance(obj, attr)
else:
klass = obj