Merge pull request #2420 from teegaar/master

Pass ipython_dir to __init__() method of TerminalInteractiveShell's superclass.
ipython · Sep 30, 2012 · a406c0d · a406c0d
2 parents d3d37a3 + 50c907e
commit a406c0d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/IPython/frontend/terminal/interactiveshell.py b/IPython/frontend/terminal/interactiveshell.py
@@ -357,7 +357,7 @@ def __init__(self, config=None, ipython_dir=None, profile_dir=None,
                  usage=None, banner1=None, banner2=None, display_banner=None):
 
         super(TerminalInteractiveShell, self).__init__(
-            config=config, profile_dir=profile_dir, user_ns=user_ns,
+            config=config, ipython_dir=ipython_dir, profile_dir=profile_dir, user_ns=user_ns,
             user_module=user_module, custom_exceptions=custom_exceptions
         )
         # use os.system instead of utils.process.system by default,