From: Éric Araujo <merwok@netwok.org>
Date: Wed, 10 Aug 2011 18:54:33 +0000 (+0200)
Subject: Remove unused names in except clauses
X-Git-Tag: v3.3.0a1~1712^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfcc9779fc7b756fa1c01b4816e16c7615a9ad3a;p=thirdparty%2FPython%2Fcpython.git

Remove unused names in except clauses
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 329add0456a2..871888453025 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -267,7 +267,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
     names = []
     try:
         names = os.listdir(path)
-    except os.error as err:
+    except os.error:
         onerror(os.listdir, path, sys.exc_info())
     for name in names:
         fullname = os.path.join(path, name)
@@ -280,7 +280,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
         else:
             try:
                 os.remove(fullname)
-            except os.error as err:
+            except os.error:
                 onerror(os.remove, fullname, sys.exc_info())
     try:
         os.rmdir(path)
@@ -323,7 +323,7 @@ def move(src, dst):
             raise Error("Destination path '%s' already exists" % real_dst)
     try:
         os.rename(src, real_dst)
-    except OSError as exc:
+    except OSError:
         if os.path.isdir(src):
             if _destinsrc(src, dst):
                 raise Error("Cannot move a directory '%s' into itself '%s'." % (src, dst))