summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authorStefan Zimmermann <zimmermann.code@gmail.com>2014-01-08 13:25:16 (GMT)
committerStefan Zimmermann <zimmermann.code@gmail.com>2014-01-08 13:25:16 (GMT)
commit26003a0bd3168f8c2ee3d92a26d35ca977f8e25b (patch)
tree5f61654ad672dbaaef043c67f2d5b74254e2abca /runtest.py
parent59ee07b24ed1278d83aa70605f51b6284aa60a82 (diff)
downloadSCons-26003a0bd3168f8c2ee3d92a26d35ca977f8e25b.zip
SCons-26003a0bd3168f8c2ee3d92a26d35ca977f8e25b.tar.gz
SCons-26003a0bd3168f8c2ee3d92a26d35ca977f8e25b.tar.bz2
Some more six.PY2/PY3 usage.
Diffstat (limited to 'runtest.py')
-rwxr-xr-xruntest.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/runtest.py b/runtest.py
index 2470a61..6380292 100755
--- a/runtest.py
+++ b/runtest.py
@@ -85,6 +85,8 @@
# rather than reinventing that wheel.)
from __future__ import print_function
+from six import PY3
+
import getopt
import glob
import os
@@ -95,9 +97,9 @@ import time
try:
import threading
- try:
+ if PY3:
from queue import Queue
- except ImportError: # Python < 3
+ else:
from Queue import Queue
threading_ok = True
except ImportError: