##// END OF EJS Templates
Merge pull request #5644 from jhamrick/master...
Thomas Kluyver -
r16417:9889b566 merge
parent child Browse files
Show More
@@ -317,6 +317,7 b' class DisplayObject(object):'
317 """An object that wraps data to be displayed."""
317 """An object that wraps data to be displayed."""
318
318
319 _read_flags = 'r'
319 _read_flags = 'r'
320 _show_mem_addr = False
320
321
321 def __init__(self, data=None, url=None, filename=None):
322 def __init__(self, data=None, url=None, filename=None):
322 """Create a display object given raw data.
323 """Create a display object given raw data.
@@ -353,7 +354,15 b' class DisplayObject(object):'
353
354
354 self.reload()
355 self.reload()
355 self._check_data()
356 self._check_data()
356
357
358 def __repr__(self):
359 if not self._show_mem_addr:
360 cls = self.__class__
361 r = "<%s.%s object>" % (cls.__module__, cls.__name__)
362 else:
363 r = super(DisplayObject, self).__repr__()
364 return r
365
357 def _check_data(self):
366 def _check_data(self):
358 """Override in subclasses if there's something to check."""
367 """Override in subclasses if there's something to check."""
359 pass
368 pass
@@ -116,3 +116,17 b' def test_set_matplotlib_formats_kwargs():'
116 expected.update(cfg.print_figure_kwargs)
116 expected.update(cfg.print_figure_kwargs)
117 nt.assert_equal(cell, expected)
117 nt.assert_equal(cell, expected)
118
118
119 def test_displayobject_repr():
120 h = display.HTML('<br />')
121 nt.assert_equal(repr(h), '<IPython.core.display.HTML object>')
122 h._show_mem_addr = True
123 nt.assert_equal(repr(h), object.__repr__(h))
124 h._show_mem_addr = False
125 nt.assert_equal(repr(h), '<IPython.core.display.HTML object>')
126
127 j = display.Javascript('')
128 nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>')
129 j._show_mem_addr = True
130 nt.assert_equal(repr(j), object.__repr__(j))
131 j._show_mem_addr = False
132 nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>')
General Comments 0
You need to be logged in to leave comments. Login now