Merge pull request #5708 from minrk/checkpoints-path

create checkpoints dir in notebook subdirectories

IPython/html/services/notebooks/filenbmanager.py

@@ -60,31 +60,15 b' class FileNotebookManager(NotebookManager):'
             return
         if not os.path.exists(new) or not os.path.isdir(new):
             raise TraitError("notebook dir %r is not a directory" % new)
-
-    checkpoint_dir = Unicode(config=True,
-        help="""The location in which to keep notebook checkpoints
+    
+    checkpoint_dir = Unicode('.ipynb_checkpoints', config=True,
+        help="""The directory name in which to keep notebook checkpoints
+        
+        This is a path relative to the notebook's own directory.
         
-        By default, it is notebook-dir/.ipynb_checkpoints
+        By default, it is .ipynb_checkpoints
         """
     )
-    def _checkpoint_dir_default(self):
-        return os.path.join(self.notebook_dir, '.ipynb_checkpoints')
-    
-    def _checkpoint_dir_changed(self, name, old, new):
-        """do a bit of validation of the checkpoint dir"""
-        if not os.path.isabs(new):
-            # If we receive a non-absolute path, make it absolute.
-            abs_new = os.path.abspath(new)
-            self.checkpoint_dir = abs_new
-            return
-        if os.path.exists(new) and not os.path.isdir(new):
-            raise TraitError("checkpoint dir %r is not a directory" % new)
-        if not os.path.exists(new):
-            self.log.info("Creating checkpoint dir %s", new)
-            try:
-                os.mkdir(new)
-            except:
-                raise TraitError("Couldn't create checkpoint dir %r" % new)
     
     def _copy(self, src, dest):
         """copy src to dest
@@ -416,7 +400,11 b' class FileNotebookManager(NotebookManager):'
             checkpoint_id=checkpoint_id,
             ext=self.filename_ext,
         )
-        cp_path = os.path.join(path, self.checkpoint_dir, filename)
+        os_path = self._get_os_path(path=path)
+        cp_dir = os.path.join(os_path, self.checkpoint_dir)
+        if not os.path.exists(cp_dir):
+            os.mkdir(cp_dir)
+        cp_path = os.path.join(cp_dir, filename)
         return cp_path
 
     def get_checkpoint_model(self, checkpoint_id, name, path=''):
@@ -455,8 +443,8 b' class FileNotebookManager(NotebookManager):'
         """
         path = path.strip('/')
         checkpoint_id = "checkpoint"
-        path = self.get_checkpoint_path(checkpoint_id, name, path)
-        if not os.path.exists(path):
+        os_path = self.get_checkpoint_path(checkpoint_id, name, path)
+        if not os.path.exists(os_path):
             return []
         else:
             return [self.get_checkpoint_model(checkpoint_id, name, path)]

IPython/html/services/notebooks/tests/test_nbmanager.py

@@ -55,6 +55,20 b' class TestFileNotebookManager(TestCase):'
             path = fm._get_os_path('test.ipynb', '////')
             fs_path = os.path.join(fm.notebook_dir, 'test.ipynb')
             self.assertEqual(path, fs_path)
+    
+    def test_checkpoint_subdir(self):
+        subd = u'sub ∂ir'
+        cp_name = 'test-cp.ipynb'
+        with TemporaryDirectory() as td:
+            nbdir = td
+            os.mkdir(os.path.join(td, subd))
+            fm = FileNotebookManager(notebook_dir=nbdir)
+            cp_dir = fm.get_checkpoint_path('cp', 'test.ipynb', '/')
+            cp_subdir = fm.get_checkpoint_path('cp', 'test.ipynb', '/%s/' % subd)
+        self.assertNotEqual(cp_dir, cp_subdir)
+        self.assertEqual(cp_dir, os.path.join(nbdir, fm.checkpoint_dir, cp_name))
+        self.assertEqual(cp_subdir, os.path.join(nbdir, subd, fm.checkpoint_dir, cp_name))
+    
 
 class TestNotebookManager(TestCase):