diff options
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__)) |