From bf341fb5f6016ca5c79cee01211631ab5a01c5cf Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Thu, 21 May 2015 15:41:57 -0400 Subject: Issue 23898: Fix inspect.classify_class_attrs() to work with __eq__ --- Lib/inspect.py | 6 +++--- Lib/test/test_inspect.py | 15 +++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py index 1641824..a91f749 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -380,7 +380,7 @@ def classify_class_attrs(cls): # first look in the classes for srch_cls in class_bases: srch_obj = getattr(srch_cls, name, None) - if srch_obj == get_obj: + if srch_obj is get_obj: last_cls = srch_cls # then check the metaclasses for srch_cls in metamro: @@ -388,7 +388,7 @@ def classify_class_attrs(cls): srch_obj = srch_cls.__getattr__(cls, name) except AttributeError: continue - if srch_obj == get_obj: + if srch_obj is get_obj: last_cls = srch_cls if last_cls is not None: homecls = last_cls @@ -402,7 +402,7 @@ def classify_class_attrs(cls): # unable to locate the attribute anywhere, most likely due to # buggy custom __dir__; discard and move on continue - obj = get_obj or dict_obj + obj = get_obj if get_obj is not None else dict_obj # Classify the object or its descriptor. if isinstance(dict_obj, staticmethod): kind = "static method" diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index a2bb9b6..8d92f82 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -782,6 +782,21 @@ class TestClassesAndFunctions(unittest.TestCase): should_find_ga = inspect.Attribute('ham', 'data', Meta, 'spam') self.assertIn(should_find_ga, inspect.classify_class_attrs(VA)) + def test_classify_overrides_bool(self): + class NoBool(object): + def __eq__(self, other): + return NoBool() + + def __bool__(self): + raise NotImplementedError( + "This object does not specify a boolean value") + + class HasNB(object): + dd = NoBool() + + should_find_attr = inspect.Attribute('dd', 'data', HasNB, HasNB.dd) + self.assertIn(should_find_attr, inspect.classify_class_attrs(HasNB)) + def test_classify_metaclass_class_attribute(self): class Meta(type): fish = 'slap' diff --git a/Misc/NEWS b/Misc/NEWS index 88e7643..0593d89 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -260,6 +260,9 @@ Library - asyncio: async() function is deprecated in favour of ensure_future(). +- Issue 23898: Fix inspect.classify_class_attrs() to support attributes + with overloaded __eq__ and __bool__. Patch by Mike Bayer. + Tests ----- -- cgit v0.12