From 7109889a218cdd12495b5fc1ba96fd0da1903b8a Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Fri, 16 Mar 2007 22:45:44 +0000 Subject: [PATCH] Drop utils.remove_dirs() in favor of os.removedirs(). Signed-off-by: Yann Dirson --- stgit/utils.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/stgit/utils.py b/stgit/utils.py index bfe77978..d04d077d 100644 --- a/stgit/utils.py +++ b/stgit/utils.py @@ -116,24 +116,16 @@ def strip_suffix(suffix, string): assert string.endswith(suffix) return string[:-len(suffix)] -def remove_dirs(basedir, dirs): - """Starting at join(basedir, dirs), remove the directory if empty, - and try the same with its parent, until we find a nonempty - directory or reach basedir.""" - path = dirs - while path: - try: - os.rmdir(os.path.join(basedir, path)) - except OSError: - return # can't remove nonempty directory - path = os.path.dirname(path) - def remove_file_and_dirs(basedir, file): """Remove join(basedir, file), and then remove the directory it was in if empty, and try the same with its parent, until we find a nonempty directory or reach basedir.""" os.remove(os.path.join(basedir, file)) - remove_dirs(basedir, os.path.dirname(file)) + try: + os.removedirs(os.path.join(basedir, os.path.dirname(file))) + except OSError: + # file's parent dir may not be empty after removal + pass def create_dirs(directory): """Create the given directory, if the path doesn't already exist.""" @@ -152,7 +144,11 @@ def rename(basedir, file1, file2): full_file2 = os.path.join(basedir, file2) create_dirs(os.path.dirname(full_file2)) os.rename(os.path.join(basedir, file1), full_file2) - remove_dirs(basedir, os.path.dirname(file1)) + try: + os.removedirs(os.path.join(basedir, os.path.dirname(file1))) + except OSError: + # file1's parent dir may not be empty after move + pass class EditorException(Exception): pass -- 2.11.4.GIT