Permalink
Browse files

Initialize input_splitter automatically via traitlets mechanism.

  • Loading branch information...
1 parent 90491ee commit 4c7fc69dc891ed7d0fe479612e54c2cc06cca7e6 @fperez fperez committed Sep 18, 2010
Showing with 6 additions and 5 deletions.
  1. +6 −5 IPython/core/interactiveshell.py
@@ -155,7 +155,11 @@ class InteractiveShell(Configurable, Magic):
exit_now = CBool(False)
filename = Str("<ipython console>")
ipython_dir= Unicode('', config=True) # Set to get_ipython_dir() in __init__
- input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter')
+
+ # Input splitter, to split entire cells of input into either individual
+ # interactive statements or whole blocks.
+ input_splitter = Instance('IPython.core.inputsplitter.IPythonInputSplitter',
+ (), {})
logstart = CBool(False, config=True)
logfile = Str('', config=True)
logappend = Str('', config=True)
@@ -393,10 +397,6 @@ def init_instance_attrs(self):
# Indentation management
self.indent_current_nsp = 0
- # Input splitter, to split entire cells of input into either individual
- # interactive statements or whole blocks.
- self.input_splitter = IPythonInputSplitter()
-
def init_environment(self):
"""Any changes we need to make to the user's environment."""
pass
@@ -1058,6 +1058,7 @@ def push(self, variables, interactive=True):
#-------------------------------------------------------------------------
# Things related to object introspection
#-------------------------------------------------------------------------
+
def _ofind(self, oname, namespaces=None):
"""Find an object in the available namespaces.

0 comments on commit 4c7fc69

Please sign in to comment.