summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-04-20 10:56:10 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2014-04-20 10:56:10 (GMT)
commita6ea2d760464092ea91a0dd01ba6260288aa3587 (patch)
tree9ae8e8c70a00a9de2dd37755f7690af833e8f26b /runtest.py
parent8490ea812140862af7058f9617959061510c3701 (diff)
downloadSCons-a6ea2d760464092ea91a0dd01ba6260288aa3587.zip
SCons-a6ea2d760464092ea91a0dd01ba6260288aa3587.tar.gz
SCons-a6ea2d760464092ea91a0dd01ba6260288aa3587.tar.bz2
Added six module as SCons.compat.six, for python3 port.
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 7155556..485374a 100755
--- a/runtest.py
+++ b/runtest.py
@@ -81,7 +81,6 @@
# rather than reinventing that wheel.)
from __future__ import print_function
-from six import PY3
import getopt
import glob
@@ -93,9 +92,9 @@ import time
try:
import threading
- if PY3:
+ try: # python3
from queue import Queue
- else:
+ except ImportError as e: # python2
from Queue import Queue
threading_ok = True
except ImportError: