From 195dcc5265e026e9c8bdead2121b5e805616bd64 Mon Sep 17 00:00:00 2001 From: mhagger Date: Sun, 18 Jul 2010 14:45:44 +0000 Subject: [PATCH] Extract a function _try_delete_files(). git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5219 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/sort.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cvs2svn_lib/sort.py b/cvs2svn_lib/sort.py index 29e2e13e..db32571e 100644 --- a/cvs2svn_lib/sort.py +++ b/cvs2svn_lib/sort.py @@ -123,6 +123,16 @@ def merge_files_onepass(input_filenames, output_filename, key=None): output_file.close() +def _try_delete_files(filenames): + """Try to remove the named files. Ignore errors.""" + + for filename in filenames: + try: + os.remove(filename) + except: + pass + + def tempfile_generator(tempdirs=[]): """Yield filenames of temporary files.""" @@ -179,17 +189,10 @@ def sort_file( merge_files_onepass(group, group_output, key) for filename in group: filenames.remove(filename) - try: - os.remove(filename) - except: - pass + _try_delete_files(group) merge_files_onepass(filenames, output, key) finally: - for filename in filenames: - try: - os.remove(filename) - except: - pass + _try_delete_files(filenames) -- 2.11.4.GIT