[autotest] Use |json| instead of |simplejson|.
simplejson was moved into the library as of python 2.4. We're now at
python 2.6/2.7, and having to keep installing simplejson everywhere has
slowly turned into a hassle. Since we can just trivially drop/rename
it, let's do so.
The rpc_interface parts of this change have been vetted, the rest is
done just as a s/simplejson/json/ across the code, which afaik should be
a safe thing to do.
BUG=None
TEST=unit, run_suite
DEPLOY=apache
Change-Id: Iab35f71157e7e5cd3be5291c776b07eb3283be8e
Reviewed-on: https://gerrit.chromium.org/gerrit/46424
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Alex Miller <milleral@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/site_utils/admin/scripts/cp_autotest_cli_to_hbs.sh b/site_utils/admin/scripts/cp_autotest_cli_to_hbs.sh
deleted file mode 100755
index 0f69812..0000000
--- a/site_utils/admin/scripts/cp_autotest_cli_to_hbs.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# Author: truty@google.com (Mike Truty)
-#
-# This script copies needed files to allow Autotest CLI access from nfs.
-
-declare -r BASE_DIR="/usr/local/autotest"
-
-declare -r TARGET_DIR="/home/build/static/projects-rw/chromeos/autotest"
-
-function checktarget() {
- [[ -d "${TARGET_DIR}" ]] || mkdir -p "${TARGET_DIR}"
-}
-
-function copyfiles() {
- local norecurse_copy_dirs="\
- . \
- client \
- site-packages/simplejson"
- echo "Copying directories..."
- for d in ${norecurse_copy_dirs}; do
- echo Copying "$d"...
- [[ -d ${TARGET_DIR}/$d ]] || mkdir -p ${TARGET_DIR}/$d
- cp -f ${BASE_DIR}/$d/* ${TARGET_DIR}/$d
- # Ignore errors - warnings abound.
- done
-
- local recurse_copy_dirs="\
- cli \
- client/common_lib \
- database \
- frontend"
- for d in ${recurse_copy_dirs}; do
- echo Copying "$d"...
- [[ -d ${TARGET_DIR}/$d ]] || mkdir -p ${TARGET_DIR}/$d
- cp -rf ${BASE_DIR}/$d/* ${TARGET_DIR}/$d
- if [[ "$?" -ne 0 ]]; then
- echo Unable to copy ${BASE_DIR}/$d to ${TARGET_DIR}/$d
- exit 1
- fi
- done
- echo "Done."
-}
-
-function main() {
- checktarget
- copyfiles
- echo "The previous Autotest directory has a btuils folder"
- echo "that needs to be copied here. These utilities are"
- echo "used to archive (btcp) results files and serve"
- echo "them (btfsserver). Please create ${TARGET_DIR}/btuils"
- echo "and copy the contents of the previous btuils folder there."
-}
-
-main
diff --git a/site_utils/experimental/croschart/update_crosreport_cache.py b/site_utils/experimental/croschart/update_crosreport_cache.py
index 0b959f2..2b35f73 100755
--- a/site_utils/experimental/croschart/update_crosreport_cache.py
+++ b/site_utils/experimental/croschart/update_crosreport_cache.py
@@ -10,7 +10,7 @@
import os
import optparse
import pprint
-import simplejson
+import json
import sys
@@ -49,7 +49,7 @@
def ReadInputFile(input_file):
"""Read the input file into a string list."""
f = open(input_file, 'r')
- chart_list = simplejson.load(f)
+ chart_list = json.load(f)
f.close()
return chart_list
diff --git a/site_utils/validate_json_files.sh b/site_utils/validate_json_files.sh
index c161a56..a044bb6 100755
--- a/site_utils/validate_json_files.sh
+++ b/site_utils/validate_json_files.sh
@@ -5,9 +5,9 @@
# found in the LICENSE file.
set -e
-echo "This assumes you have python-simplejson installed"
+echo "This assumes you have python 2.4 or later installed"
for json in *.json; do
echo "Validating $json"
- python -c "import simplejson; simplejson.load(open('$json'))" || \
+ python -c "import json; json.load(open('$json'))" || \
printf "\n\n$json is broken!!!!\n\n"
done