aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-01-16 16:41:45 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-01-16 16:41:45 -0800
commit261dd98e5ebccfa2948929c78ec7e1c12f9a3fa8 (patch)
tree9c38f11dba0bc4a7562050ae6f3b982f7842e24f /tools
parent55c3b27d2e78e39802b2b89f704b99808bd7b94d (diff)
Use Python json module
Instead of third party simplejson module, to save a dependency.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index d291abf3bf..0826dfc7a4 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -4,13 +4,13 @@
import argparse
import glob
import itertools
+import json
import multiprocessing
import os
import sys
import time
import jobset
-import simplejson
import watch_dirs
@@ -159,12 +159,12 @@ class TestCache(object):
def save(self):
with open('.run_tests_cache', 'w') as f:
- f.write(simplejson.dumps(self.dump()))
+ f.write(json.dumps(self.dump()))
def maybe_load(self):
if os.path.exists('.run_tests_cache'):
with open('.run_tests_cache') as f:
- self.parse(simplejson.loads(f.read()))
+ self.parse(json.loads(f.read()))
def _build_and_run(check_cancelled, newline_on_success, cache):