Neater code using getattr, as suggested by MinRK.

takluyver · May 17, 2011 · 27bb014 · 27bb014
1 parent 0437a1f
commit 27bb014
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
@@ -662,10 +662,8 @@ def info(self, obj, oname='', formatter=None, info=None, detail_level=0):
         # from its __call__ method.
 
         if inspect.isclass(obj):
-            try:
-                callable_obj = obj.__init__
-            except AttributeError:
-                callable_obj = None
+            # Old-style classes need not have an __init__
+            callable_obj = getattr(obj, "__init__", None)
         elif callable(obj):
             callable_obj = obj
         else: