Merge pull request #5003 from takluyver/thats-pretty-super

Fix pretty reprs of super() objects

IPython/lib/pretty.py

@@ -678,7 +678,7 b' def _dict_pprinter_factory(start, end, basetype=None):'
 def _super_pprint(obj, p, cycle):
     """The pprint for the super type."""
     p.begin_group(8, '<super: ')
-    p.pretty(obj.__self_class__)
+    p.pretty(obj.__thisclass__)
     p.text(',')
     p.breakable()
     p.pretty(obj.__self__)

IPython/lib/tests/test_pretty.py

@@ -181,4 +181,19 b' def test_really_bad_repr():'
     nt.assert_in("failed", output)
     nt.assert_in("BadException: unknown", output)
     nt.assert_in("unknown type", output)
+
+
+class SA(object):
+    pass
+
+class SB(SA):
+    pass
+
+def test_super_repr():
+    output = pretty.pretty(super(SA))
+    nt.assert_in("SA", output)
+
+    sb = SB()
+    output = pretty.pretty(super(SA, sb))
+    nt.assert_in("SA", output)
     
  No newline at end of file