mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-11 12:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Not allowing permanent deletion of non empty dirs

Browse Source
This commit is contained in:
Kirit Thadaka 2017-12-05 04:30:54 +05:30
parent bcc343d9b2
commit f24d3d7265
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
notebook/services/contents/filemanager.py
View File

@ -493,6 +493,15 @@ 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