##// END OF EJS Templates
Merge pull request #10634 from mraduldubey/patch-1...
Matthias Bussonnier -
r23749:57cf9b11 merge
parent child Browse files
Show More
@@ -279,6 +279,13 b' def display(*objs, include=None, exclude=None, metadata=None, transient=None, di'
279 from IPython.display import display
279 from IPython.display import display
280
280
281 """
281 """
282 from IPython.core.interactiveshell import InteractiveShell
283
284 if not InteractiveShell.initialized():
285 # Directly print objects.
286 print(*objs)
287 return
288
282 raw = kwargs.pop('raw', False)
289 raw = kwargs.pop('raw', False)
283 if transient is None:
290 if transient is None:
284 transient = {}
291 transient = {}
@@ -293,8 +300,6 b' def display(*objs, include=None, exclude=None, metadata=None, transient=None, di'
293 if transient:
300 if transient:
294 kwargs['transient'] = transient
301 kwargs['transient'] = transient
295
302
296 from IPython.core.interactiveshell import InteractiveShell
297
298 if not raw:
303 if not raw:
299 format = InteractiveShell.instance().display_formatter.format
304 format = InteractiveShell.instance().display_formatter.format
300
305
General Comments 0
You need to be logged in to leave comments. Login now