##// END OF EJS Templates
Merge pull request #10952 from ipython/auto-backport-of-pr-10634...
Thomas Kluyver -
r24104:37c9ed80 merge
parent child Browse files
Show More
@@ -277,6 +277,13 b' def display(*objs, **kwargs):'
277 from IPython.display import display
277 from IPython.display import display
278
278
279 """
279 """
280 from IPython.core.interactiveshell import InteractiveShell
281
282 if not InteractiveShell.initialized():
283 # Directly print objects.
284 print(*objs)
285 return
286
280 raw = kwargs.pop('raw', False)
287 raw = kwargs.pop('raw', False)
281 include = kwargs.pop('include', None)
288 include = kwargs.pop('include', None)
282 exclude = kwargs.pop('exclude', None)
289 exclude = kwargs.pop('exclude', None)
@@ -294,8 +301,6 b' def display(*objs, **kwargs):'
294 if transient:
301 if transient:
295 kwargs['transient'] = transient
302 kwargs['transient'] = transient
296
303
297 from IPython.core.interactiveshell import InteractiveShell
298
299 if not raw:
304 if not raw:
300 format = InteractiveShell.instance().display_formatter.format
305 format = InteractiveShell.instance().display_formatter.format
301
306
General Comments 0
You need to be logged in to leave comments. Login now