Changeset 107139 in webkit


Ignore:
Timestamp:
Feb 8, 2012 3:26:32 PM (12 years ago)
Author:
abarth@webkit.org
Message:

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:
Location:
trunk/Tools
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r107138 r107139  
     12012-02-08  Adam Barth  <abarth@webkit.org>
     2
     3        webkitpy still imports simplejson
     4        https://bugs.webkit.org/show_bug.cgi?id=78161
     5
     6        Reviewed by Eric Seidel.
     7
     8        We no longer support Python 2.5, so we can rely upon Python's built-in
     9        JSON package.
     10
     11        * Scripts/webkitpy/common/net/buildbot/buildbot.py:
     12        * Scripts/webkitpy/common/net/resultsjsonparser.py:
     13        * Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py:
     14        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
     15        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
     16        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
     17        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
     18        * Scripts/webkitpy/style/checkers/jsonchecker.py:
     19        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
     20        * Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
     21        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
     22
    1232012-02-08  Gustavo Noronha Silva  <gns@gnome.org>
    224
  • trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py

    r104754 r107139  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 #
    29 # WebKit's Python module for interacting with WebKit's buildbot
    30 
    31 try:
    32     import json
    33 except ImportError:
    34     # python 2.5 compatibility
    35     import webkitpy.thirdparty.simplejson as json
    36 
     28
     29import json
    3730import operator
    3831import re
  • trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py

    r97931 r107139  
    2828
    2929
    30 try:
    31     import json
    32 except ImportError:
    33     # python 2.5 compatibility
    34     import webkitpy.thirdparty.simplejson as json
     30import json
    3531
    3632from webkitpy.common.memoized import memoized
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py

    r97782 r107139  
    3333
    3434import itertools
     35import json
    3536import logging
    3637import re
    37 
    38 try:
    39     import json
    40 except ImportError:
    41     # python 2.5 compatibility
    42     import webkitpy.thirdparty.simplejson as json
    4338
    4439from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

    r106687 r107139  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29import json
    2930import logging
    3031import os
     
    3637
    3738from webkitpy.common.net.file_uploader import FileUploader
    38 
    39 try:
    40     import json
    41 except ImportError:
    42     # python 2.5 compatibility
    43     import webkitpy.thirdparty.simplejson as json
    4439
    4540# A JSON results generator for generic tests.
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py

    r105199 r107139  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 """Unit tests for json_results_generator.py."""
    30 
    3129import unittest
     30import json
    3231import optparse
    3332import random
     
    3938from webkitpy.thirdparty.mock import Mock
    4039
    41 try:
    42     import json
    43 except ImportError, e:
    44     from webkitpy.thirdparty import simplejson as json
    4540
    4641class JSONGeneratorTest(unittest.TestCase):
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

    r106591 r107139  
    3333
    3434import itertools
     35import json
    3536import logging
    3637import re
    37 
    38 try:
    39     import json
    40 except ImportError:
    41     # python 2.5 compatibility
    42     import webkitpy.thirdparty.simplejson as json
    4338
    4439from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter
  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py

    r107136 r107139  
    3232import codecs
    3333import itertools
     34import json
    3435import logging
    3536import Queue
     
    4748except ImportError:
    4849    multiprocessing = None
    49 
    50 try:
    51     import json
    52 except ImportError:
    53     # python 2.5 compatibility
    54     import webkitpy.thirdparty.simplejson as json
    5550
    5651# FIXME: remove this when we fix test-webkitpy to work properly on cygwin
  • trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py

    r104740 r107139  
    2323"""Checks WebKit style for JSON files."""
    2424
     25import json
    2526import re
    26 
    27 try:
    28     import json
    29 except ImportError:
    30     # python 2.5 compatibility
    31     import webkitpy.thirdparty.simplejson as json
    3227
    3328
  • trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py

    r99233 r107139  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 try:
    30     import json
    31 except ImportError:
    32     # python 2.5 compatibility
    33     import webkitpy.thirdparty.simplejson as json
    34 
     29import json
    3530import unittest
    3631
  • trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py

    r105183 r107139  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29import json
    2930import unittest
    30 
    31 try:
    32     import json
    33 except ImportError:
    34     # python 2.5 compatibility
    35     import webkitpy.thirdparty.simplejson as json
    36 
    3731
    3832from webkitpy.common.net import resultsjsonparser_unittest
  • trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py

    r107136 r107139  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 try:
    30     import json
    31 except ImportError:
    32     # python 2.5 compatibility
    33     import webkitpy.thirdparty.simplejson as json
    34 
    3529import BaseHTTPServer
    3630
     
    3933import datetime
    4034import fnmatch
     35import json
    4136import mimetypes
    4237import os
Note: See TracChangeset for help on using the changeset viewer.