changeset 23263 | dd51abf0aa17 |
parent 23139 | e53f6b72a0e4 |
child 23347 | 49cdf51cbc6c |
--- a/tests/run-tests.py Mon Nov 10 13:27:25 2014 -0500 +++ b/tests/run-tests.py Mon Nov 10 13:20:56 2014 -0500 @@ -61,12 +61,12 @@ import unittest try: - if sys.version_info < (2, 7): + import json +except ImportError: + try: import simplejson as json - else: - import json -except ImportError: - json = None + except ImportError: + json = None processlock = threading.Lock()