##// END OF EJS Templates
Avoid calling inline config if no shell - per @minrk feedback on #1052
Fernando Perez -
Show More
@@ -267,9 +267,6 b' def configure_inline_support(shell, backend, user_ns=None):'
267 A namespace where all configured variables will be placed. If not given,
267 A namespace where all configured variables will be placed. If not given,
268 the `user_ns` attribute of the shell object is used.
268 the `user_ns` attribute of the shell object is used.
269 """
269 """
270 if shell is None:
271 return
272
273 # If using our svg payload backend, register the post-execution
270 # If using our svg payload backend, register the post-execution
274 # function that will pick up the results for display. This can only be
271 # function that will pick up the results for display. This can only be
275 # done with access to the real shell object.
272 # done with access to the real shell object.
@@ -333,7 +330,8 b' def pylab_activate(user_ns, gui=None, import_all=True, shell=None):'
333 gui, backend = find_gui_and_backend(gui)
330 gui, backend = find_gui_and_backend(gui)
334 activate_matplotlib(backend)
331 activate_matplotlib(backend)
335 import_pylab(user_ns, import_all)
332 import_pylab(user_ns, import_all)
336 configure_inline_support(shell, backend, user_ns)
333 if shell is not None:
334 configure_inline_support(shell, backend, user_ns)
337
335
338 print """
336 print """
339 Welcome to pylab, a matplotlib-based Python environment [backend: %s].
337 Welcome to pylab, a matplotlib-based Python environment [backend: %s].
General Comments 0
You need to be logged in to leave comments. Login now