Changed order of checks in delete_file

notebook/services/contents/filemanager.py

@@ -493,15 +493,6 @@ class FileContentsManager(FileManagerMixin, ContentsManager):
             raise web.HTTPError(404, u'File or directory does not exist: %s' % os_path)
 
         if self.delete_to_trash:
-            if os.path.isdir(os_path):
-                listing = os.listdir(os_path)
-                # Don't send non-empty directories to trash.
-                # A directory containing only leftover checkpoints is
-                # considered empty.
-                cp_dir = getattr(self.checkpoints, 'checkpoint_dir', None)
-                for entry in listing:
-                    if entry != cp_dir:
-                        raise web.HTTPError(400, u'Directory %s not empty' % os_path)
             self.log.debug("Sending %s to trash", os_path)
             # Looking at the code in send2trash, I don't think the errors it
             # raises let us distinguish permission errors from other errors in
@@ -510,6 +501,14 @@ class FileContentsManager(FileManagerMixin, ContentsManager):
             return
 
         if os.path.isdir(os_path):
+            listing = os.listdir(os_path)
+            # Don't permanently delete non-empty directories.
+            # A directory containing only leftover checkpoints is
+            # considered empty.
+            cp_dir = getattr(self.checkpoints, 'checkpoint_dir', None)
+            for entry in listing:
+                if entry != cp_dir:
+                    raise web.HTTPError(400, u'Directory %s not empty' % os_path)
             self.log.debug("Removing directory %s", os_path)
             with self.perm_to_403():
                 shutil.rmtree(os_path)

notebook/services/contents/tests/test_contents_api.py

@@ -518,8 +518,7 @@ class APITest(NotebookTestBase):
         for name in sorted(self.dirs + ['/'], key=len, reverse=True):
             listing = self.api.list(name).json()['content']
             for model in listing:
-                if os.path.exists(model['path']):
-                    self.api.delete(model['path'])
+                self.api.delete(model['path'])
         listing = self.api.list('/').json()['content']
         self.assertEqual(listing, [])