Merge pull request ipython#2123 from rkern/fix-pretty

BUG: Look up the `_repr_pretty_` method on the class using the MRO

IPython/lib/pretty.py

@@ -353,8 +353,8 @@ def pretty(self, obj):
                         # Some objects automatically create any requested
                         # attribute. Try to ignore most of them by checking for
                         # callability.
-                        if '_repr_pretty_' in obj_class.__dict__:
-                            meth = obj_class._repr_pretty_
+                        if '_repr_pretty_' in cls.__dict__:
+                            meth = cls._repr_pretty_
                             if callable(meth):
                                 return meth(obj, self, cycle)
             return _default_pprint(obj, self, cycle)

IPython/lib/tests/test_pretty.py

@@ -45,6 +45,14 @@ def _repr_pretty_(self, p, cycle):
         p.text("MyDict(...)")
 
 
+class Dummy1(object):
+    def _repr_pretty_(self, p, cycle):
+        p.text("Dummy1(...)")
+
+class Dummy2(Dummy1):
+    _repr_pretty_ = None
+
+
 def test_indentation():
     """Test correct indentation in groups"""
     count = 40
@@ -63,3 +71,14 @@ def test_dispatch():
     expectedoutput = "MyDict(...)"
 
     nt.assert_equals(gotoutput, expectedoutput)
+
+
+def test_callability_checking():
+    """
+    Test that the _repr_pretty_ method is tested for callability and skipped if
+    not.
+    """
+    gotoutput = pretty.pretty(Dummy2())
+    expectedoutput = "Dummy1(...)"
+
+    nt.assert_equals(gotoutput, expectedoutput)