Show More
@@ -2416,7 +2416,7 b' class InteractiveShell(SingletonConfigurable, Magic):' | |||||
2416 | # Things related to GUI support and pylab |
|
2416 | # Things related to GUI support and pylab | |
2417 | #------------------------------------------------------------------------- |
|
2417 | #------------------------------------------------------------------------- | |
2418 |
|
2418 | |||
2419 | def enable_pylab(self, gui=None): |
|
2419 | def enable_pylab(self, gui=None, inport_all=True): | |
2420 | raise NotImplementedError('Implement enable_pylab in a subclass') |
|
2420 | raise NotImplementedError('Implement enable_pylab in a subclass') | |
2421 |
|
2421 | |||
2422 | #------------------------------------------------------------------------- |
|
2422 | #------------------------------------------------------------------------- |
@@ -417,7 +417,7 b' class TerminalInteractiveShell(InteractiveShell):' | |||||
417 | # Things related to GUI support and pylab |
|
417 | # Things related to GUI support and pylab | |
418 | #------------------------------------------------------------------------- |
|
418 | #------------------------------------------------------------------------- | |
419 |
|
419 | |||
420 | def enable_pylab(self, gui=None): |
|
420 | def enable_pylab(self, gui=None, import_all=True): | |
421 | """Activate pylab support at runtime. |
|
421 | """Activate pylab support at runtime. | |
422 |
|
422 | |||
423 | This turns on support for matplotlib, preloads into the interactive |
|
423 | This turns on support for matplotlib, preloads into the interactive | |
@@ -440,7 +440,7 b' class TerminalInteractiveShell(InteractiveShell):' | |||||
440 | # code in an empty namespace, and we update *both* user_ns and |
|
440 | # code in an empty namespace, and we update *both* user_ns and | |
441 | # user_ns_hidden with this information. |
|
441 | # user_ns_hidden with this information. | |
442 | ns = {} |
|
442 | ns = {} | |
443 | gui = pylab_activate(ns, gui) |
|
443 | gui = pylab_activate(ns, gui, import_all) | |
444 | self.user_ns.update(ns) |
|
444 | self.user_ns.update(ns) | |
445 | self.user_ns_hidden.update(ns) |
|
445 | self.user_ns_hidden.update(ns) | |
446 | # Now we must activate the gui pylab wants to use, and fix %run to take |
|
446 | # Now we must activate the gui pylab wants to use, and fix %run to take |
General Comments 0
You need to be logged in to leave comments.
Login now