Changeset 91214 in webkit

Timestamp:

Jul 18, 2011 3:27:54 PM (13 years ago)

Author:

abarth@webkit.org

Message:

simplejson has trouble on chromium-linux
​https://bugs.webkit.org/show_bug.cgi?id=64757

Reviewed by Eric Seidel.

Use the native JSON, if available.

• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (2 diffs)
• Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-18  Adam Barth  <abarth@webkit.org>
+
+        simplejson has trouble on chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=64757
+
+        Reviewed by Eric Seidel.
+
+        Use the native JSON, if available.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+
 2011-07-18  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py

@@ -32 +32 @@
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
-import webkitpy.thirdparty.simplejson as simplejson
-
 
 class JSONLayoutResultsGenerator(json_results_generator.JSONResultsGeneratorBase):

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

@@ -36 +36 @@
 
 from webkitpy.layout_tests.layout_package import test_results_uploader
-import webkitpy.thirdparty.simplejson as simplejson
+
+try:
+    import json
+except ImportError:
+    # python 2.5 compatibility
+    import webkitpy.thirdparty.simplejson as json
 
 # A JSON results generator for generic tests.
@@ -58 +63 @@
     content = filesystem.read_text_file(file_path)
     content = strip_json_wrapper(content)
-    return simplejson.loads(content)
+    return json.loads(content)
 
 
 def write_json(filesystem, json_object, file_path):
     # Specify separators in order to get compact encoding.
-    json_data = simplejson.dumps(json_object, separators=(',', ':'))
+    json_data = json.dumps(json_object, separators=(',', ':'))
     json_string = _JSON_PREFIX + json_data + _JSON_SUFFIX
     filesystem.write_text_file(file_path, json_string)
@@ -238 +243 @@
 
     def generate_json_output(self):
-        json = self.get_json()
-        if json:
+        json_object = self.get_json()
+        if json_object:
             file_path = self._fs.join(self._results_directory, self.INCREMENTAL_RESULTS_FILENAME)
-            write_json(self._fs, json, file_path)
+            write_json(self._fs, json_object, file_path)
 
     def generate_times_ms_file(self):
@@ -430 +435 @@
 
             try:
-                results_json = simplejson.loads(old_results)
+                results_json = json.loads(old_results)
             except:
                 _log.debug("results.json was not valid JSON. Clobbering.")

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -36 +36 @@
 import re
 
-import webkitpy.thirdparty.simplejson as simplejson
+try:
+    import json
+except ImportError:
+    # python 2.5 compatibility
+    import webkitpy.thirdparty.simplejson as json
 
 
@@ -127 +131 @@
 
 
-class ExpectationsJsonEncoder(simplejson.JSONEncoder):
+class ExpectationsJsonEncoder(json.JSONEncoder):
     """JSON encoder that can handle ModifiersAndExpectations objects."""
     def default(self, obj):

trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py

@@ -29 +29 @@
 import unittest
 
+try:
+    import json
+except ImportError:
+    # python 2.5 compatibility
+    import webkitpy.thirdparty.simplejson as json
+
 from webkitpy.common.net import resultsjsonparser_unittest
 from webkitpy.common.system import filesystem_mock
 from webkitpy.layout_tests.layout_package.json_results_generator import strip_json_wrapper
 from webkitpy.layout_tests.port.webkit import WebKitPort
-import webkitpy.thirdparty.simplejson as simplejson
 from webkitpy.tool.commands.rebaselineserver import TestConfig, RebaselineServer
 from webkitpy.tool.mocktool import MockSCM
@@ -208 +213 @@
     def test_gather_baselines(self):
         example_json = resultsjsonparser_unittest.ResultsJSONParserTest._example_full_results_json
-        results_json = simplejson.loads(strip_json_wrapper(example_json))
+        results_json = json.loads(strip_json_wrapper(example_json))
         server = RebaselineServer()
         server._test_config = get_test_config()