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/helper.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/helper.py')
| -rw-r--r-- | testing/helper.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/testing/helper.py b/testing/helper.py index 88da48c6e..d192cf061 100644 --- a/testing/helper.py +++ b/testing/helper.py @@ -37,8 +37,6 @@ ## ############################################################################# -from __future__ import print_function - """ testing/helper.py @@ -49,17 +47,9 @@ import os import sys from collections import namedtuple -PY3 = sys.version_info[0] == 3 # from the six module from subprocess import PIPE -if PY3: - from subprocess import TimeoutExpired - from io import StringIO -else: - class SubprocessError(Exception): pass - # this is a fake, just to keep the source compatible. - # timeout support is in python 3.3 and above. - class TimeoutExpired(SubprocessError): pass - from StringIO import StringIO +from subprocess import TimeoutExpired +from io import StringIO script_dir = os.path.dirname(os.path.dirname(__file__)) |