# HG changeset patch # User Martin von Zweigbergk # Date 2017-05-16 21:42:13 # Node ID dc131b9772f2738d11867c7ae91e49c70f817b0b # Parent 8627cf4de929035f17e6676318e385d62fef3910 run-tests: drop fallback for proc.terminate() for pre-py2.6 diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -523,10 +523,10 @@ def log(*msg): sys.stdout.flush() def terminate(proc): - """Terminate subprocess (with fallback for Python versions < 2.6)""" + """Terminate subprocess""" vlog('# Terminating process %d' % proc.pid) try: - getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))() + proc.terminate() except OSError: pass