diff options
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestCmd.py | 4 | ||||
| -rw-r--r-- | QMTest/TestCmdTests.py | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index d645731..f8c4e69 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -287,8 +287,6 @@ version. # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. from __future__ import division, print_function -from SCons.compat.six import PY3 - __author__ = "Steven Knight <knight at baldmt dot com>" __revision__ = "TestCmd.py 1.3.D001 2010/06/03 12:58:27 knight" __version__ = "1.3" @@ -1730,8 +1728,6 @@ class TestCmd(object): exist. The I/O mode for the file may be specified; it must begin with a 'w'. The default is 'wb' (binary write). """ - if PY3: - content = re.sub(r'print (.+)', r'print(\1)', content) file = self.canonicalize(file) if mode[0] != 'w': raise ValueError("mode must begin with 'w'") diff --git a/QMTest/TestCmdTests.py b/QMTest/TestCmdTests.py index a2e7022..cd62d9f 100644 --- a/QMTest/TestCmdTests.py +++ b/QMTest/TestCmdTests.py @@ -19,8 +19,6 @@ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. """ -from SCons.compat.six import PY3 - __author__ = "Steven Knight <knight at baldmt dot com>" __revision__ = "TestCmdTests.py 1.3.D001 2010/06/03 12:58:27 knight" @@ -28,19 +26,13 @@ import os import shutil import signal import stat -if PY3: - from io import StringIO -else: - from StringIO import StringIO +from StringIO import StringIO import sys import tempfile import time import types import unittest -if PY3: - from collections import UserList -else: - from UserList import UserList +from UserList import UserList # Strip the current directory so we get the right TestCmd.py module. |