| Index: Tools/TestResultServer/model/jsonresults.py
|
| diff --git a/Tools/TestResultServer/model/jsonresults.py b/Tools/TestResultServer/model/jsonresults.py
|
| index 16316f3a17e014ca91d80825fb9fd1309d4009b9..9da9d3251e5e4e92bf3ee04d75950677d44a6acc 100755
|
| --- a/Tools/TestResultServer/model/jsonresults.py
|
| +++ b/Tools/TestResultServer/model/jsonresults.py
|
| @@ -26,8 +26,7 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -from datetime import datetime
|
| -from django.utils import simplejson
|
| +import json
|
| import logging
|
| import sys
|
| import traceback
|
| @@ -107,8 +106,8 @@ class JsonResults(object):
|
| return data
|
|
|
| @classmethod
|
| - def _generate_file_data(cls, json, sort_keys=False):
|
| - return simplejson.dumps(json, separators=(',', ':'), sort_keys=sort_keys)
|
| + def _generate_file_data(cls, data, sort_keys=False):
|
| + return json.dumps(data, separators=(',', ':'), sort_keys=sort_keys)
|
|
|
| @classmethod
|
| def _load_json(cls, file_data):
|
| @@ -118,7 +117,7 @@ class JsonResults(object):
|
| return None
|
|
|
| try:
|
| - return simplejson.loads(json_results_str)
|
| + return json.loads(json_results_str)
|
| except:
|
| logging.debug(json_results_str)
|
| logging.error("Failed to load json results: %s", traceback.print_exception(*sys.exc_info()))
|
|
|