Merge pull request #670 from stepshal/exception

Use 'except Exception:' instead of 'except:'.

2 files changed, 3 insertions, 3 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 5ce529b2..468b9be7 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -431,7 +431,7 @@ class easy_install(Command):
         """
         try:
             pid = os.getpid()
-        except:
+        except Exception:
             pid = random.randint(0, sys.maxsize)
         return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
@@ -929,7 +929,7 @@ class easy_install(Command):
                     destination,
                     fix_zipimporter_caches=new_dist_is_zipped,
                 )
-            except:
+            except Exception:
                 update_dist_caches(destination, fix_zipimporter_caches=False)
                 raise
 
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index b86aae50..b6125f58 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -99,7 +99,7 @@ class sdist(orig.sdist):
         #  file.
         try:
             orig.sdist.read_template(self)
-        except:
+        except Exception:
             _, _, tb = sys.exc_info()
             tb.tb_next.tb_frame.f_locals['template'].close()
             raise