Changeset 107139 in webkit
- Timestamp:
- Feb 8, 2012 3:26:32 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r107138 r107139 1 2012-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 1 23 2012-02-08 Gustavo Noronha Silva <gns@gnome.org> 2 24 -
trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py
r104754 r107139 26 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 27 # 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 29 import json 37 30 import operator 38 31 import re -
trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
r97931 r107139 28 28 29 29 30 try: 31 import json 32 except ImportError: 33 # python 2.5 compatibility 34 import webkitpy.thirdparty.simplejson as json 30 import json 35 31 36 32 from webkitpy.common.memoized import memoized -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_expectations_editor.py
r97782 r107139 33 33 34 34 import itertools 35 import json 35 36 import logging 36 37 import re 37 38 try:39 import json40 except ImportError:41 # python 2.5 compatibility42 import webkitpy.thirdparty.simplejson as json43 38 44 39 from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
r106687 r107139 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 import json 29 30 import logging 30 31 import os … … 36 37 37 38 from webkitpy.common.net.file_uploader import FileUploader 38 39 try:40 import json41 except ImportError:42 # python 2.5 compatibility43 import webkitpy.thirdparty.simplejson as json44 39 45 40 # A JSON results generator for generic tests. -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
r105199 r107139 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 """Unit tests for json_results_generator.py."""30 31 29 import unittest 30 import json 32 31 import optparse 33 32 import random … … 39 38 from webkitpy.thirdparty.mock import Mock 40 39 41 try:42 import json43 except ImportError, e:44 from webkitpy.thirdparty import simplejson as json45 40 46 41 class JSONGeneratorTest(unittest.TestCase): -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
r106591 r107139 33 33 34 34 import itertools 35 import json 35 36 import logging 36 37 import re 37 38 try:39 import json40 except ImportError:41 # python 2.5 compatibility42 import webkitpy.thirdparty.simplejson as json43 38 44 39 from webkitpy.layout_tests.models.test_configuration import TestConfiguration, TestConfigurationConverter -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
r107136 r107139 32 32 import codecs 33 33 import itertools 34 import json 34 35 import logging 35 36 import Queue … … 47 48 except ImportError: 48 49 multiprocessing = None 49 50 try:51 import json52 except ImportError:53 # python 2.5 compatibility54 import webkitpy.thirdparty.simplejson as json55 50 56 51 # FIXME: remove this when we fix test-webkitpy to work properly on cygwin -
trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py
r104740 r107139 23 23 """Checks WebKit style for JSON files.""" 24 24 25 import json 25 26 import re 26 27 try:28 import json29 except ImportError:30 # python 2.5 compatibility31 import webkitpy.thirdparty.simplejson as json32 27 33 28 -
trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
r99233 r107139 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 try: 30 import json 31 except ImportError: 32 # python 2.5 compatibility 33 import webkitpy.thirdparty.simplejson as json 34 29 import json 35 30 import unittest 36 31 -
trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py
r105183 r107139 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 import json 29 30 import unittest 30 31 try:32 import json33 except ImportError:34 # python 2.5 compatibility35 import webkitpy.thirdparty.simplejson as json36 37 31 38 32 from webkitpy.common.net import resultsjsonparser_unittest -
trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py
r107136 r107139 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 try:30 import json31 except ImportError:32 # python 2.5 compatibility33 import webkitpy.thirdparty.simplejson as json34 35 29 import BaseHTTPServer 36 30 … … 39 33 import datetime 40 34 import fnmatch 35 import json 41 36 import mimetypes 42 37 import os
Note: See TracChangeset
for help on using the changeset viewer.