diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-10-27 20:33:53 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-10-28 13:56:47 +0000 |
| commit | b78e5bd771f0d5a81692bc95f76929b092edf2f6 (patch) | |
| tree | d372ad4a75aa8ec766a77e50627c77fed39092e1 /testing/runner.py | |
| parent | 1fceed1fc3565080eef556c9b71498780aa94bf2 (diff) | |
testing: remove __future__ and Python2 references
Change-Id: I80079d8a0956e3cc9b27ceb5b5ea2cfc6c9c9449
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'testing/runner.py')
| -rw-r--r-- | testing/runner.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/testing/runner.py b/testing/runner.py index 83b7b08e6..9b1f88b8f 100644 --- a/testing/runner.py +++ b/testing/runner.py @@ -37,8 +37,6 @@ ## ############################################################################# -from __future__ import print_function - import os import sys import re @@ -49,7 +47,7 @@ from collections import namedtuple from textwrap import dedent from .buildlog import builds -from .helper import decorate, PY3, TimeoutExpired +from .helper import decorate, TimeoutExpired # Get the dir path to the utils module try: @@ -211,7 +209,7 @@ class TestRunner(object): stdin=ctest_process.stdout) try: comm = tee_process.communicate - output = (comm(timeout=timeout) if PY3 else comm())[0] + output = (comm(timeout=timeout) except (TimeoutExpired, KeyboardInterrupt): print() print("aborted, partial result") |