Merge pull request #1689 from bfroehle/_1240_ipython_kernel_sys_path

Fix sys.path missing '' as first entry in `ipython kernel`.

Adds init_path to InteractiveShellApp, to avoid future entry points having the same omission.

closes  #1240

IPython/core/shellapp.py

@@ -117,9 +117,10 b' class InteractiveShellApp(Configurable):'
     
     Provides configurables for loading extensions and executing files
     as part of configuring a Shell environment.
-    
-    Provides init_extensions() and init_code() methods, to be called
-    after init_shell(), which must be implemented by subclasses.
+
+    Provides init_path(), to be called before, and init_extensions() and
+    init_code() methods, to be called after init_shell(), which must be
+    implemented by subclasses.
     """
     extensions = List(Unicode, config=True,
         help="A list of dotted module names of IPython extensions to load."
@@ -156,6 +157,11 b' class InteractiveShellApp(Configurable):'
     )
     shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
 
+    def init_path(self):
+        """Add current working directory, '', to sys.path"""
+        if sys.path[0] != '':
+            sys.path.insert(0, '')
+
     def init_shell(self):
         raise NotImplementedError("Override in subclasses")
     

IPython/frontend/terminal/ipapp.py

@@ -314,6 +314,7 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
         # print self.extra_args
         if self.extra_args and not self.something_to_run:
             self.file_to_run = self.extra_args[0]
+        self.init_path()
         # create the shell
         self.init_shell()
         # and draw the banner
@@ -325,10 +326,6 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
 
     def init_shell(self):
         """initialize the InteractiveShell instance"""
-        # I am a little hesitant to put these into InteractiveShell itself.
-        # But that might be the place for them
-        sys.path.insert(0, '')
-
         # Create an InteractiveShell instance.
         # shell.display_banner should always be False for the terminal
         # based app, because we call shell.show_banner() by hand below

IPython/zmq/ipkernel.py

@@ -597,6 +597,7 b' class IPKernelApp(KernelApp, InteractiveShellApp):'
     @catch_config_error
     def initialize(self, argv=None):
         super(IPKernelApp, self).initialize(argv)
+        self.init_path()
         self.init_shell()
         self.init_extensions()
         self.init_code()