diff options
| -rw-r--r-- | Lib/inspect.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_inspect.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index 4e17f1b..521d2a6 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1084,7 +1084,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: @@ -1109,8 +1109,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 @@ -1126,7 +1126,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 diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 7666fe4..abbdc9f 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -1004,6 +1004,11 @@ class TestGetattrStatic(unittest.TestCase): self.assertEqual(inspect.getattr_static(instance, "spam"), 42) self.assertFalse(Thing.executed) + def test_module(self): + sentinel = object() + self.assertIsNot(inspect.getattr_static(sys, "version", sentinel), + sentinel) + class TestGetGeneratorState(unittest.TestCase): def setUp(self): @@ -97,6 +97,9 @@ Core and Builtins Library ------- +- Issue #11813: Fix inspect.getattr_static for modules. Patch by Andreas + Stührk. + - Issue #7502: Fix equality comparison for DocTestCase instances. Patch by Cédric Krier. |