From: Just van Rossum <just@letterror.com>
Date: Sun, 5 Jan 2003 19:44:11 +0000 (+0000)
Subject: - squashed bare except in rmtree()
X-Git-Tag: v2.3c1~2582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66d16baf71ce821c657dc37bd970f6285efeda8e;p=thirdparty%2FPython%2Fcpython.git

- squashed bare except in rmtree()
- improved readability of rmtree; removed silly apply()
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 6aa2e3d669e4..ad5c99d38f07 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):