Merge pull request #10625 from kr1m/master

Fix signature for IPython.core.display:Pretty  #10595

IPython/core/display.py

@@ -672,8 +672,8 b' class TextDisplayObject(DisplayObject):'
 
 class Pretty(TextDisplayObject):
 
-    def _repr_pretty_(self):
-        return self.data
+    def _repr_pretty_(self, pp, cycle):
+        return pp.text(self.data)
 
 
 class HTML(TextDisplayObject):

IPython/core/tests/test_display.py

@@ -162,6 +162,13 b' def test_display_available():'
     with AssertNotPrints('NameError'):
         ip.run_cell('display')
 
+def test_textdisplayobj_pretty_repr():
+     p = display.Pretty("This is a simple test")
+     nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>')
+     nt.assert_equal(p.data, 'This is a simple test')
+
+     p._show_mem_addr = True
+     nt.assert_equal(repr(p), object.__repr__(p))
 
 def test_displayobject_repr():
     h = display.HTML('<br />')