##// END OF EJS Templates
Initialize input_splitter automatically via traitlets mechanism.
Fernando Perez -
Show More
@@ -155,7 +155,11 b' class InteractiveShell(Configurable, Magic):'
155 exit_now = CBool(False)
155 exit_now = CBool(False)
156 filename = Str("<ipython console>")
156 filename = Str("<ipython console>")
157 ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__
157 ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__
158 input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter')
158
159 # Input splitter, to split entire cells of input into either individual
160 # interactive statements or whole blocks.
161 input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter',
162 (), {})
159 logstart = CBool(False, config=True)
163 logstart = CBool(False, config=True)
160 logfile = Str('', config=True)
164 logfile = Str('', config=True)
161 logappend = Str('', config=True)
165 logappend = Str('', config=True)
@@ -393,10 +397,6 b' class InteractiveShell(Configurable, Magic):'
393 # Indentation management
397 # Indentation management
394 self.indent_current_nsp = 0
398 self.indent_current_nsp = 0
395
399
396 # Input splitter, to split entire cells of input into either individual
397 # interactive statements or whole blocks.
398 self.input_splitter = IPythonInputSplitter()
399
400 def init_environment(self):
400 def init_environment(self):
401 """Any changes we need to make to the user's environment."""
401 """Any changes we need to make to the user's environment."""
402 pass
402 pass
@@ -1058,6 +1058,7 b' class InteractiveShell(Configurable, Magic):'
1058 #-------------------------------------------------------------------------
1058 #-------------------------------------------------------------------------
1059 # Things related to object introspection
1059 # Things related to object introspection
1060 #-------------------------------------------------------------------------
1060 #-------------------------------------------------------------------------
1061
1061 def _ofind(self, oname, namespaces=None):
1062 def _ofind(self, oname, namespaces=None):
1062 """Find an object in the available namespaces.
1063 """Find an object in the available namespaces.
1063
1064
General Comments 0
You need to be logged in to leave comments. Login now