From 66d16baf71ce821c657dc37bd970f6285efeda8e Mon Sep 17 00:00:00 2001 From: Just van Rossum Date: Sun, 5 Jan 2003 19:44:11 +0000 Subject: [PATCH] - squashed bare except in rmtree() - improved readability of rmtree; removed silly apply() --- Lib/shutil.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py index 6aa2e3d669..ad5c99d38f 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -127,17 +127,17 @@ def rmtree(path, ignore_errors=0, onerror=None): """ cmdtuples = [] _build_cmdtuple(path, cmdtuples) - for cmd in cmdtuples: + for func, arg in cmdtuples: try: - apply(cmd[0], (cmd[1],)) - except: + func(arg) + except OSError: exc = sys.exc_info() if ignore_errors: pass elif onerror is not None: - onerror(cmd[0], cmd[1], exc) + onerror(func, arg, exc) else: - raise exc[0], (exc[1][0], exc[1][1] + ' removing '+cmd[1]) + raise exc[0], (exc[1][0], exc[1][1] + ' removing '+arg) # Helper for rmtree() def _build_cmdtuple(path, cmdtuples): -- 2.40.0