summaryrefslogtreecommitdiff
path: root/runtest.py
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2018-08-30 10:48:27 -0600
committerMats Wichmann <mats@linux.com>2018-08-30 10:50:07 -0600
commitb215cbc5022148bff6fe6986780794fa80e75b2b (patch)
tree3e8dfe5a1aee246f0fe336f357a474781f0270af /runtest.py
parentc487700ccd4cae873170b812c2f201f1400d8dea (diff)
downloadscons-git-b215cbc5022148bff6fe6986780794fa80e75b2b.tar.gz
Rework the time.clock -> time.perf_counter change
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'runtest.py')
-rwxr-xr-xruntest.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/runtest.py b/runtest.py
index 1cac45b83..697b872e2 100755
--- a/runtest.py
+++ b/runtest.py
@@ -95,10 +95,8 @@ import time
import threading
try: # python3
from queue import Queue
- PY3=True
except ImportError as e: # python2
from Queue import Queue
- PY3=False
import subprocess
cwd = os.getcwd()
@@ -771,7 +769,8 @@ os.environ["python_executable"] = python
# but time.time() does a better job on Linux systems, so let that be
# the non-Windows default.
-if PY3:
+#TODO: clean up when py2 support is dropped
+try:
time_func = time.perf_counter
else:
if sys.platform == 'win32':