Issue #24245: Eliminated senseless expect clauses that have no any effect.
Patch by Martin Panter.
This commit is contained in:
parent
ba9ac5b5c4
commit
e98209c2b4
|
@ -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 -- "
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -112,8 +112,6 @@ class Font:
|
|||
try:
|
||||
if self.delete_font:
|
||||
self._call("font", "delete", self.name)
|
||||
except (KeyboardInterrupt, SystemExit):
|
||||
raise
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in New Issue