fix inspect.isclass() on instances with a custom __getattr__ #1225107
diff --git a/Lib/inspect.py b/Lib/inspect.py
index a89d62e..1453f3b 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -62,7 +62,7 @@
Class objects provide these attributes:
__doc__ documentation string
__module__ name of module in which this class was defined"""
- return isinstance(object, types.ClassType) or hasattr(object, '__bases__')
+ return isinstance(object, (type, types.ClassType))
def ismethod(object):
"""Return true if the object is an instance method.
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index b653f40..7312cac 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -65,7 +65,6 @@
def test_excluding_predicates(self):
self.istest(inspect.isbuiltin, 'sys.exit')
self.istest(inspect.isbuiltin, '[].append')
- self.istest(inspect.isclass, 'mod.StupidGit')
self.istest(inspect.iscode, 'mod.spam.func_code')
self.istest(inspect.isframe, 'tb.tb_frame')
self.istest(inspect.isfunction, 'mod.spam')
@@ -91,6 +90,18 @@
self.assert_(inspect.isroutine(mod.spam))
self.assert_(inspect.isroutine([].count))
+ def test_isclass(self):
+ self.istest(inspect.isclass, 'mod.StupidGit')
+ self.assertTrue(inspect.isclass(list))
+
+ class newstyle(object): pass
+ self.assertTrue(inspect.isclass(newstyle))
+
+ class CustomGetattr(object):
+ def __getattr__(self, attr):
+ return None
+ self.assertFalse(inspect.isclass(CustomGetattr()))
+
def test_get_slot_members(self):
class C(object):
__slots__ = ("a", "b")