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

Fix pretty reprs of super() objects
ipython · Feb 4, 2014 · f98dd14 · f98dd14
2 parents 6acbd12 + 98b2968
commit f98dd14
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/IPython/lib/pretty.py b/IPython/lib/pretty.py
@@ -678,7 +678,7 @@ def inner(obj, p, cycle):
 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__)

diff --git a/IPython/lib/tests/test_pretty.py b/IPython/lib/tests/test_pretty.py
@@ -181,4 +181,19 @@ 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)