Issue #24245: Eliminated senseless expect clauses that have no any effect.

Patch by Martin Panter.

diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py
index 2bfe66aa2f49d5c699f62ab7cbe3a88cd78d318a..f05b34b295d177cd215081a60502772ba8d38fd9 100644 (file)
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@ -221,8 +221,6 @@ def run_setup (script_name, script_args=None, stop_after="run"):
         # Hmm, should we do something if exiting with a non-zero code
         # (ie. error)?
         pass
-    except:
-        raise
 
     if _setup_distribution is None:
         raise RuntimeError(("'distutils.core.setup()' was never called -- "

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7123ffbdd237de408f65068e6788af1517176292..5b1fcc6bc4beb24a33622b42e785f4fe4d09472d 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -765,8 +765,6 @@ def main(tests=None, **kwargs):
                 except KeyboardInterrupt:
                     interrupted = True
                     break
-                except:
-                    raise
             if ns.findleaks:
                 gc.collect()
                 if gc.garbage:
@@ -823,8 +821,6 @@ def main(tests=None, **kwargs):
                 # print a newline separate from the ^C
                 print()
                 break
-            except:
-                raise
 
     if ns.single:
         if next_single_test:

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 17f9d1bdee3d5432f35c51da2da8dfb43152925d..cad83fd5aa6a88407d0b1388f667dbbbcfe0c239 100644 (file)
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -20,8 +20,6 @@ def _retry_thrice(func, exc, *args, **kwargs):
         except exc as e:
             last_exc = e
             continue
-        except:
-            raise
     raise last_exc
 
 def _wrap_with_retry_thrice(func, exc):

diff --git a/Lib/tkinter/font.py b/Lib/tkinter/font.py
index a04fedf655cd401d99dff3d3f50492a0e20310e3..e74049c8aa3102b0b5db2c18fa5a81099e58d319 100644 (file)
--- a/Lib/tkinter/font.py
+++ b/Lib/tkinter/font.py
@@ -112,8 +112,6 @@ class Font:
         try:
             if self.delete_font:
                 self._call("font", "delete", self.name)
-        except (KeyboardInterrupt, SystemExit):
-            raise
         except Exception:
             pass
 

diff --git a/Lib/unittest/test/support.py b/Lib/unittest/test/support.py
index 02e8f3a00b64a85a2f8090621705f0c214f68176..529265304f288259027b644f5f9de6249a9aee36 100644 (file)
--- a/Lib/unittest/test/support.py
+++ b/Lib/unittest/test/support.py
@@ -25,8 +25,6 @@ class TestHashing(object):
             try:
                 if not hash(obj_1) == hash(obj_2):
                     self.fail("%r and %r do not hash equal" % (obj_1, obj_2))
-            except KeyboardInterrupt:
-                raise
             except Exception as e:
                 self.fail("Problem hashing %r and %r: %s" % (obj_1, obj_2, e))
 
@@ -35,8 +33,6 @@ class TestHashing(object):
                 if hash(obj_1) == hash(obj_2):
                     self.fail("%s and %s hash equal, but shouldn't" %
                               (obj_1, obj_2))
-            except KeyboardInterrupt:
-                raise
             except Exception as e:
                 self.fail("Problem hashing %s and %s: %s" % (obj_1, obj_2, e))