##// END OF EJS Templates
Final attempt to fix init_io logic.
Brian Granger -
Show More
@@ -209,6 +209,7 b' class InteractiveShell(Configurable, Magic):'
209 display_trap = Instance('IPython.core.display_trap.DisplayTrap')
209 display_trap = Instance('IPython.core.display_trap.DisplayTrap')
210 extension_manager = Instance('IPython.core.extensions.ExtensionManager')
210 extension_manager = Instance('IPython.core.extensions.ExtensionManager')
211 plugin_manager = Instance('IPython.core.plugin.PluginManager')
211 plugin_manager = Instance('IPython.core.plugin.PluginManager')
212 payload_manager = Instance('IPython.core.paylaod.PayloadManager')
212
213
213 def __init__(self, config=None, ipython_dir=None,
214 def __init__(self, config=None, ipython_dir=None,
214 user_ns=None, user_global_ns=None,
215 user_ns=None, user_global_ns=None,
@@ -272,6 +273,7 b' class InteractiveShell(Configurable, Magic):'
272 self.init_pdb()
273 self.init_pdb()
273 self.init_extension_manager()
274 self.init_extension_manager()
274 self.init_plugin_manager()
275 self.init_plugin_manager()
276 self.init_payload()
275 self.hooks.late_startup_hook()
277 self.hooks.late_startup_hook()
276
278
277 @classmethod
279 @classmethod
@@ -428,7 +430,7 b' class InteractiveShell(Configurable, Magic):'
428 import IPython.utils.io
430 import IPython.utils.io
429 if sys.platform == 'win32' and self.has_readline:
431 if sys.platform == 'win32' and self.has_readline:
430 Term = IPython.utils.io.IOTerm(
432 Term = IPython.utils.io.IOTerm(
431 cout=readline._outputfile,cerr=readline._outputfile
433 cout=self.readline._outputfile,cerr=self.readline._outputfile
432 )
434 )
433 else:
435 else:
434 Term = IPython.utils.io.IOTerm()
436 Term = IPython.utils.io.IOTerm()
@@ -1649,6 +1651,13 b' class InteractiveShell(Configurable, Magic):'
1649 self.plugin_manager = PluginManager(config=self.config)
1651 self.plugin_manager = PluginManager(config=self.config)
1650
1652
1651 #-------------------------------------------------------------------------
1653 #-------------------------------------------------------------------------
1654 # Things related to payloads
1655 #-------------------------------------------------------------------------
1656
1657 def init_payload(self):
1658 self.payload_manager = PayloadManager(config=self.config)
1659
1660 #-------------------------------------------------------------------------
1652 # Things related to the prefilter
1661 # Things related to the prefilter
1653 #-------------------------------------------------------------------------
1662 #-------------------------------------------------------------------------
1654
1663
General Comments 0
You need to be logged in to leave comments. Login now