Revert "Change TestResultServer to use python 2.7."

Tools/TestResultServer/model/jsonresults.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
 # in the documentation and/or other materials provided with the
 # distribution.
 #     * Neither the name of Google Inc. nor the names of its
 # contributors may be used to endorse or promote products derived from
 # this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import json
+from datetime import datetime
+from django.utils import simplejson
 import logging
 import sys
 import traceback
 
 from model.testfile import TestFile
 
 JSON_RESULTS_FILE = "results.json"
 JSON_RESULTS_FILE_SMALL = "results-small.json"
 JSON_RESULTS_PREFIX = "ADD_RESULTS("
 JSON_RESULTS_SUFFIX = ");"
@@ skipping 59 matching lines @@
 
 class JsonResults(object):
     @classmethod
     def _strip_prefix_suffix(cls, data):
         # FIXME: Stop stripping jsonp callback once we upload pure json everywhere.
         if data.startswith(JSON_RESULTS_PREFIX) and data.endswith(JSON_RESULTS_SUFFIX):
             return data[len(JSON_RESULTS_PREFIX):len(data) - len(JSON_RESULTS_SUFFIX)]
         return data
 
     @classmethod
-    def _generate_file_data(cls, data, sort_keys=False):
-        return json.dumps(data, separators=(',', ':'), sort_keys=sort_keys)
+    def _generate_file_data(cls, json, sort_keys=False):
+        return simplejson.dumps(json, separators=(',', ':'), sort_keys=sort_keys)
 
     @classmethod
     def _load_json(cls, file_data):
         json_results_str = cls._strip_prefix_suffix(file_data)
         if not json_results_str:
             logging.warning("No json results data.")
             return None
 
         try:
-            return json.loads(json_results_str)
+            return simplejson.loads(json_results_str)
         except:
             logging.debug(json_results_str)
             logging.error("Failed to load json results: %s", traceback.print_exception(*sys.exc_info()))
             return None
 
     @classmethod
     def _merge_json(cls, aggregated_json, incremental_json, num_runs):
         cls._merge_non_test_data(aggregated_json, incremental_json, num_runs)
         incremental_tests = incremental_json[JSON_RESULTS_TESTS]
         if incremental_tests:
@@ skipping 221 matching lines @@
 
         logging.debug("Checking test results json...")
         if not cls._check_json(builder, json):
             return None
 
         test_list_json = {}
         tests = json[builder][JSON_RESULTS_TESTS]
         cls._delete_results_and_times(tests)
         test_list_json[builder] = {"tests": tests}
         return cls._generate_file_data(test_list_json)