Merge pull request #7078 from takluyver/kernelpath

Rework get_kernel_path logic

IPython/html/services/contents/filemanager.py

@@ -611,9 +611,9 b' class FileContentsManager(ContentsManager):'
         return "Serving notebooks from local directory: %s" % self.root_dir
 
     def get_kernel_path(self, path, model=None):
-        """Return the initial working dir a kernel associated with a given notebook"""
+        """Return the initial API path of  a kernel associated with a given notebook"""
         if '/' in path:
             parent_dir = path.rsplit('/', 1)[0]
         else:
             parent_dir = ''
-        return self._get_os_path(parent_dir)
+        return parent_dir

IPython/html/services/contents/manager.py

@@ -187,8 +187,12 b' class ContentsManager(LoggingConfigurable):'
         
         KernelManagers can turn this value into a filesystem path,
         or ignore it altogether.
+
+        The default value here will start kernels in the directory of the
+        notebook server. FileContentsManager overrides this to use the
+        directory containing the notebook.
         """
-        return path
+        return ''
 
     def increment_filename(self, filename, path='', insert=''):
         """Increment a filename until it is unique.

IPython/html/services/kernels/kernelmanager.py

@@ -54,14 +54,10 b' class MappingKernelManager(MultiKernelManager):'
 
     def cwd_for_path(self, path):
         """Turn API path into absolute OS path."""
-        # short circuit for NotebookManagers that pass in absolute paths
-        if os.path.exists(path):
-            return path
-
         os_path = to_os_path(path, self.root_dir)
         # in the case of notebooks and kernels not being on the same filesystem,
         # walk up to root_dir if the paths don't exist
-        while not os.path.exists(os_path) and os_path != self.root_dir:
+        while not os.path.isdir(os_path) and os_path != self.root_dir:
             os_path = os.path.dirname(os_path)
         return os_path