# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1415643656 18000
# Node ID dd51abf0aa175ffd792d835f783ad3e74ac3fcc3
# Parent  86a8658c77ff3977231ce8690c13f347e598a1e4
run-tests: use a try/except ladder instead of looking for a specific version

This ensures we get json instead of simplejson in as many places as possible.

diff -r 86a8658c77ff -r dd51abf0aa17 tests/run-tests.py
--- 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()