Diff
Modified: trunk/Tools/ChangeLog (107138 => 107139)
--- trunk/Tools/ChangeLog 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/ChangeLog 2012-02-08 23:26:32 UTC (rev 107139)
@@ -1,3 +1,25 @@
+2012-02-08 Adam Barth <[email protected]>
+
+ webkitpy still imports simplejson
+ https://bugs.webkit.org/show_bug.cgi?id=78161
+
+ Reviewed by Eric Seidel.
+
+ We no longer support Python 2.5, so we can rely upon Python's built-in
+ JSON package.
+
+ * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+ * Scripts/webkitpy/common/net/resultsjsonparser.py:
+ * Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py:
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ * Scripts/webkitpy/style/checkers/jsonchecker.py:
+ * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+ * Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
+ * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+
2012-02-08 Gustavo Noronha Silva <[email protected]>
[GTK] Fails to build docs with non-standard build directories
Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -25,15 +25,8 @@
# 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.
-#
-# WebKit's Python module for interacting with WebKit's buildbot
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
+import json
import operator
import re
import urllib
Modified: trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -27,11 +27,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
+import json
from webkitpy.common.memoized import memoized
from webkitpy.common.system.deprecated_logging import log
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -32,15 +32,10 @@
"""
import itertools
+import json
import logging
import re
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter
from webkitpy.layout_tests.models import test_expectations
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -26,6 +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.
+import json
import logging
import os
import subprocess
@@ -36,12 +37,6 @@
from webkitpy.common.net.file_uploader import FileUploader
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
# A JSON results generator for generic tests.
# FIXME: move this code out of the layout_package directory.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -26,9 +26,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-"""Unit tests for json_results_generator.py."""
-
import unittest
+import json
import optparse
import random
@@ -38,10 +37,6 @@
from webkitpy.layout_tests.port import test
from webkitpy.thirdparty.mock import Mock
-try:
- import json
-except ImportError, e:
- from webkitpy.thirdparty import simplejson as json
class JSONGeneratorTest(unittest.TestCase):
def setUp(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -32,15 +32,10 @@
"""
import itertools
+import json
import logging
import re
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter
_log = logging.getLogger(__name__)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -31,6 +31,7 @@
import codecs
import itertools
+import json
import logging
import Queue
import re
@@ -47,12 +48,6 @@
except ImportError:
multiprocessing = None
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
# FIXME: remove this when we fix test-webkitpy to work properly on cygwin
# (bug 63846).
SHOULD_TEST_PROCESSES = multiprocessing and sys.platform not in ('cygwin', 'win32')
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -22,15 +22,10 @@
"""Checks WebKit style for JSON files."""
+import json
import re
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
class JSONChecker(object):
"""Processes JSON lines for checking style."""
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -26,12 +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.
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
+import json
import unittest
from webkitpy.common.system.outputcapture import OutputCapture
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -26,15 +26,9 @@
# (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
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.host_mock import MockHost
from webkitpy.layout_tests.layout_package.json_results_generator import strip_json_wrapper
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py (107138 => 107139)
--- trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py 2012-02-08 23:20:31 UTC (rev 107138)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py 2012-02-08 23:26:32 UTC (rev 107139)
@@ -26,18 +26,13 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-try:
- import json
-except ImportError:
- # python 2.5 compatibility
- import webkitpy.thirdparty.simplejson as json
-
import BaseHTTPServer
import cgi
import codecs
import datetime
import fnmatch
+import json
import mimetypes
import os
import os.path
