##// END OF EJS Templates
Merge pull request #3608 from ivanov/nicer-backend-msg...
Matthias Bussonnier -
r11311:9be9a917 merge
parent child Browse files
Show More
@@ -2852,7 +2852,7 b' class InteractiveShell(SingletonConfigurable):'
2852 make sense in all contexts, for example a terminal ipython can't
2852 make sense in all contexts, for example a terminal ipython can't
2853 display figures inline.
2853 display figures inline.
2854 """
2854 """
2855 from IPython.core.pylabtools import mpl_runner
2855 from IPython.core.pylabtools import mpl_runner, backends
2856 # We want to prevent the loading of pylab to pollute the user's
2856 # We want to prevent the loading of pylab to pollute the user's
2857 # namespace as shown by the %who* magics, so we execute the activation
2857 # namespace as shown by the %who* magics, so we execute the activation
2858 # code in an empty namespace, and we update *both* user_ns and
2858 # code in an empty namespace, and we update *both* user_ns and
@@ -2861,7 +2861,8 b' class InteractiveShell(SingletonConfigurable):'
2861 try:
2861 try:
2862 gui = pylab_activate(ns, gui, import_all, self, welcome_message=welcome_message)
2862 gui = pylab_activate(ns, gui, import_all, self, welcome_message=welcome_message)
2863 except KeyError:
2863 except KeyError:
2864 error("Backend %r not supported" % gui)
2864 error("Backend '%s' not supported. Supported backends are: %s"
2865 % (gui, " ".join(sorted(backends.keys()))))
2865 return
2866 return
2866 except ImportError:
2867 except ImportError:
2867 error("pylab mode doesn't work as matplotlib could not be found." + \
2868 error("pylab mode doesn't work as matplotlib could not be found." + \
General Comments 0
You need to be logged in to leave comments. Login now