⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 252440 in webkit


Ignore:
Timestamp:
Nov 13, 2019, 5:04:35 PM (7 years ago)
Author:
Jonathan Bedard
Message:

Python 3: Add support in webkitpy.style.checkers
​https://bugs.webkit.org/show_bug.cgi?id=203761

Rubber-stamped by Stephanie Lewis.

  • Scripts/test-webkitpy-python3: Add webkitpy.style.checkers.
  • Scripts/webkitpy/port/builders.py:

(all_port_names): Convert map to a list before concatenating.

  • Scripts/webkitpy/style/checkers/changelog.py: Use explicit imports.
  • Scripts/webkitpy/style/checkers/changelog_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/cmake.py: Ditto.
  • Scripts/webkitpy/style/checkers/cmake_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/common_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/contributors.py: Ditto.
  • Scripts/webkitpy/style/checkers/cpp.py:

(Position): Add rich comparison functions.
(check_for_copyright): Use range instead of xrange.
(detect_functions): Ditto.
(check_language): Use r-string.
(check_for_include_what_you_use): Use range instead of xrange.
(_process_lines): Convert iterator to list, use range instead of xrange.

  • Scripts/webkitpy/style/checkers/cpp_unittest.py:

(CppStyleTest): Be explicit about bytes vs strings.

  • Scripts/webkitpy/style/checkers/js.py: Use explicit imports.
  • Scripts/webkitpy/style/checkers/js_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/jsonchecker.py: Ditto.

(JSONFeaturesChecker.check):

  • Scripts/webkitpy/style/checkers/jsonchecker_unittest.py: Ditto.

(JSONCheckerTest.test_conflict_marker): Differentiate between Python 2 and 3
json parsers.

  • Scripts/webkitpy/style/checkers/jstest_unittest.py: Use explicit imports.
  • Scripts/webkitpy/style/checkers/messagesin.py: Ditto.
  • Scripts/webkitpy/style/checkers/messagesin_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/png_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/python.py:

(PythonChecker.check): Only run pylint in Python 2.
(PythonChecker._check_pylint): Use r string.
(Pylinter.run): Surpress logging from Pylint.

  • Scripts/webkitpy/style/checkers/python_unittest.py: Use explicit imports.

(PythonCheckerTest.test_check): Add FIXME for running pylint in Python 3.

  • Scripts/webkitpy/style/checkers/python_unittest_falsepositives.py:
  • Scripts/webkitpy/style/checkers/python_unittest_input.py:
  • Scripts/webkitpy/style/checkers/test_expectations.py: Use explicit imports.
  • Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/text.py: Ditto.
  • Scripts/webkitpy/style/checkers/text_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/watchlist_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/xcodeproj_unittest.py: Ditto.
  • Scripts/webkitpy/style/checkers/xml_unittest.py: Ditto.
  • Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook._install_pep8): Update pep8 version.

Location:
trunk/Tools
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r252438 r252440  
     12019-11-13  Jonathan Bedard  <jbedard@apple.com>
     2
     3        Python 3: Add support in webkitpy.style.checkers
     4        https://bugs.webkit.org/show_bug.cgi?id=203761
     5
     6        Rubber-stamped by Stephanie Lewis.
     7
     8        * Scripts/test-webkitpy-python3: Add webkitpy.style.checkers.
     9        * Scripts/webkitpy/port/builders.py:
     10        (all_port_names): Convert map to a list before concatenating.
     11        * Scripts/webkitpy/style/checkers/changelog.py: Use explicit imports.
     12        * Scripts/webkitpy/style/checkers/changelog_unittest.py: Ditto.
     13        * Scripts/webkitpy/style/checkers/cmake.py: Ditto.
     14        * Scripts/webkitpy/style/checkers/cmake_unittest.py: Ditto.
     15        * Scripts/webkitpy/style/checkers/common_unittest.py: Ditto.
     16        * Scripts/webkitpy/style/checkers/contributors.py: Ditto.
     17        * Scripts/webkitpy/style/checkers/cpp.py:
     18        (Position): Add rich comparison functions.
     19        (check_for_copyright): Use range instead of xrange.
     20        (detect_functions): Ditto.
     21        (check_language): Use r-string.
     22        (check_for_include_what_you_use): Use range instead of xrange.
     23        (_process_lines): Convert iterator to list, use range instead of xrange.
     24        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
     25        (CppStyleTest): Be explicit about bytes vs strings.
     26        * Scripts/webkitpy/style/checkers/js.py: Use explicit imports.
     27        * Scripts/webkitpy/style/checkers/js_unittest.py: Ditto.
     28        * Scripts/webkitpy/style/checkers/jsonchecker.py: Ditto.
     29        (JSONFeaturesChecker.check):
     30        * Scripts/webkitpy/style/checkers/jsonchecker_unittest.py: Ditto.
     31        (JSONCheckerTest.test_conflict_marker): Differentiate between Python 2 and 3
     32        json parsers.
     33        * Scripts/webkitpy/style/checkers/jstest_unittest.py: Use explicit imports.
     34        * Scripts/webkitpy/style/checkers/messagesin.py: Ditto.
     35        * Scripts/webkitpy/style/checkers/messagesin_unittest.py: Ditto.
     36        * Scripts/webkitpy/style/checkers/png_unittest.py: Ditto.
     37        * Scripts/webkitpy/style/checkers/python.py:
     38        (PythonChecker.check): Only run pylint in Python 2.
     39        (PythonChecker._check_pylint): Use r string.
     40        (Pylinter.run): Surpress logging from Pylint.
     41        * Scripts/webkitpy/style/checkers/python_unittest.py: Use explicit imports.
     42        (PythonCheckerTest.test_check): Add FIXME for running pylint in Python 3.
     43        * Scripts/webkitpy/style/checkers/python_unittest_falsepositives.py:
     44        * Scripts/webkitpy/style/checkers/python_unittest_input.py:
     45        * Scripts/webkitpy/style/checkers/test_expectations.py: Use explicit imports.
     46        * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: Ditto.
     47        * Scripts/webkitpy/style/checkers/text.py: Ditto.
     48        * Scripts/webkitpy/style/checkers/text_unittest.py: Ditto.
     49        * Scripts/webkitpy/style/checkers/watchlist_unittest.py: Ditto.
     50        * Scripts/webkitpy/style/checkers/xcodeproj_unittest.py: Ditto.
     51        * Scripts/webkitpy/style/checkers/xml_unittest.py: Ditto.
     52        * Scripts/webkitpy/thirdparty/__init__.py:
     53        (AutoinstallImportHook._install_pep8): Update pep8 version.
     54
    1552019-11-13  Jer Noble  <jer.noble@apple.com>
    256

  • trunk/Tools/Scripts/test-webkitpy-python3

    r251961 r252440  
    3939  'webkitpy.port',
    4040  'webkitpy.results',
     41  'webkitpy.style.checkers',
    4142  'webkitpy.xcode',
    4243]

  • trunk/Tools/Scripts/webkitpy/port/builders.py

    r225274 r252440  
    103103
    104104def all_port_names():
    105     return sorted(set(map(lambda x: x["port_name"], _exact_matches.values()) + _ports_without_builders))
     105    return sorted(set(list(map(lambda x: x["port_name"], _exact_matches.values())) + _ports_without_builders))
    106106
    107107

  • trunk/Tools/Scripts/webkitpy/style/checkers/changelog.py

    r207146 r252440  
    2424"""Checks WebKit style for ChangeLog files."""
    2525
    26 from common import TabChecker, match, search, searchIgnorecase
    2726from sys import maxsize
    2827from webkitpy.common.checkout.changelog import parse_bug_id_from_changelog
     28from webkitpy.style.checkers.common import TabChecker, match, search, searchIgnorecase
    2929
    3030

  • trunk/Tools/Scripts/webkitpy/style/checkers/changelog_unittest.py

    r223177 r252440  
    2424"""Unit test for changelog.py."""
    2525
    26 import changelog
    2726import unittest
     27
     28from webkitpy.style.checkers import changelog
    2829
    2930

  • trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py

    r185065 r252440  
    2626"""Supports checking WebKit style in cmake files.(.cmake, CMakeLists.txt)"""
    2727
    28 from common import TabChecker, match, search, searchIgnorecase
     28from webkitpy.style.checkers.common import TabChecker, match, search, searchIgnorecase
    2929
    3030

  • trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py

    r185065 r252440  
    2525import unittest
    2626
    27 from cmake import CMakeChecker
     27from webkitpy.style.checkers.cmake import CMakeChecker
    2828
    2929

  • trunk/Tools/Scripts/webkitpy/style/checkers/common_unittest.py

    r202362 r252440  
    2525import unittest
    2626
    27 from common import CarriageReturnChecker
    28 from common import TabChecker
     27from webkitpy.style.checkers.common import CarriageReturnChecker
     28from webkitpy.style.checkers.common import TabChecker
    2929
    3030

  • trunk/Tools/Scripts/webkitpy/style/checkers/contributors.py

    r225698 r252440  
    2727import re
    2828from sets import Set
    29 from jsonchecker import JSONChecker
     29from webkitpy.style.checkers.jsonchecker import JSONChecker
    3030from webkitpy.common.config.committers import CommitterList
    3131from webkitpy.common.system.filesystem import FileSystem

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

    r252433 r252440  
    4646import unicodedata
    4747
    48 from common import match, search, sub, subn
     48from webkitpy.style.checkers.common import match, search, sub, subn
    4949from webkitpy.common.memoized import memoized
     50from webkitpy.common.unicode_compatibility import unicode
    5051
    5152# The key to use to provide a class to fake loading a header file.
    … …  
    367368
    368369    def __cmp__(self, other):
    369         return self.row.__cmp__(other.row) or self.column.__cmp__(other.column)
     370        return (self.row - other.row) or (self.column - other.column)
     371
     372    def __eq__(self, other):
     373        return self.__cmp__(other) == 0
     374
     375    def __ne__(self, other):
     376        return self.__cmp__(other) != 0
     377
     378    def __lt__(self, other):
     379        return self.__cmp__(other) < 0
     380
     381    def __le__(self, other):
     382        return self.__cmp__(other) <= 0
     383
     384    def __gt__(self, other):
     385        return self.__cmp__(other) > 0
     386
     387    def __ge__(self, other):
     388        return self.__cmp__(other) >= 0
    370389
    371390
    … …  
    898917    # We'll say it should occur by line 10. Don't forget there's a
    899918    # dummy line at the front.
    900     for line in xrange(1, min(len(lines), 11)):
     919    for line in range(1, min(len(lines), 11)):
    901920        if re.search(r'Copyright', lines[line], re.I):
    902921            break
    … …  
    15971616
    15981617    joined_line = ''
    1599     for start_line_number in xrange(line_number, clean_lines.num_lines()):
     1618    for start_line_number in range(line_number, clean_lines.num_lines()):
    16001619        start_line = clean_lines.elided[start_line_number]
    16011620        joined_line += ' ' + start_line.lstrip()
    … …  
    33703389        previous_closing_angle_bracket_index = -1
    33713390        closing_angle_bracket_index = 9 # Used if only one pair of angle brackets.
    3372         for i in xrange(10, len(match_line) - 1):
     3391        for i in range(10, len(match_line) - 1):
    33733392            if match_line[i] == '<':
    33743393                nested_angle_bracket_count += 1
    … …  
    33833402                break
    33843403
    3385     matched = re.compile('^\s*SOFT_LINK_(PRIVATE_)?FRAMEWORK.*\((\S+)\)').search(line)
     3404    matched = re.compile(r'^\s*SOFT_LINK_(PRIVATE_)?FRAMEWORK.*\((\S+)\)').search(line)
    33863405    if matched:
    33873406        framework_name = matched.group(2)
    … …  
    38843903        # Example of required: { '<functional>': (1219, 'less<>') }
    38853904
    3886     for line_number in xrange(clean_lines.num_lines()):
     3905    for line_number in range(clean_lines.num_lines()):
    38873906        line = clean_lines.elided[line_number]
    38883907        if not line or line[0] == '#':
    … …  
    39273946    # include_state is modified during iteration, so we iterate over a copy of
    39283947    # the keys.
    3929     for header in include_state.keys():  # NOLINT
     3948    for header in list(include_state.keys()):  # NOLINT
    39303949        (same_module, common_path) = files_belong_to_same_module(abs_filename, header)
    39313950        fullpath = common_path + header
    … …  
    40524071    enum_state = _EnumState()
    40534072    asm_state = _InlineASMState()
    4054     for line in xrange(clean_lines.num_lines()):
     4073    for line in range(clean_lines.num_lines()):
    40554074        process_line(filename, file_extension, clean_lines, line,
    40564075                     include_state, function_state, class_state, file_state,

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

    r252433 r252440  
    4141import re
    4242import unittest
    43 import cpp as cpp_style
    44 from cpp import CppChecker
    45 from ..filter import FilterConfiguration
     43from webkitpy.common.unicode_compatibility import decode_if_necessary
     44from webkitpy.style.checkers import cpp as cpp_style
     45from webkitpy.style.checkers.cpp import CppChecker
     46from webkitpy.style.filter import FilterConfiguration
    4647
    4748
    … …  
    24482449            error_collector = ErrorCollector(self.assertTrue)
    24492450            self.process_file_data('foo.cpp', 'cpp',
    2450                                    unicode(raw_bytes, 'utf8', 'replace').split('\n'),
     2451                                   decode_if_necessary(raw_bytes, encoding='utf8', errors='replace').split('\n'),
    24512452                                   error_collector)
    24522453            # The warning appears only once.
    … …  
    24582459                    '  [readability/utf8] [5]'))
    24592460
    2460         do_test(self, 'Hello world\n', False)
    2461         do_test(self, '\xe9\x8e\xbd\n', False)
    2462         do_test(self, '\xe9x\x8e\xbd\n', True)
     2461        do_test(self, b'Hello world\n', False)
     2462        do_test(self, b'\xe9\x8e\xbd\n', False)
     2463        do_test(self, b'\xe9x\x8e\xbd\n', True)
    24632464        # This is the encoding of the replacement character itself (which
    24642465        # you can see by evaluating codecs.getencoder('utf8')(u'\ufffd')).
    2465         do_test(self, '\xef\xbf\xbd\n', True)
     2466        do_test(self, b'\xef\xbf\xbd\n', True)
    24662467
    24672468    def test_is_blank_line(self):
    … …  
    27872788                                random.choice(types)]
    27882789            # remove None
    2789             other_decl_specs = filter(lambda x: x is not None, other_decl_specs)
     2790            other_decl_specs = list(filter(lambda x: x is not None, other_decl_specs))
    27902791
    27912792            # shuffle

  • trunk/Tools/Scripts/webkitpy/style/checkers/js.py

    r202362 r252440  
    3131"""
    3232
    33 from common import TabChecker
    3433import re
     34from webkitpy.style.checkers.common import TabChecker
    3535
    3636

  • trunk/Tools/Scripts/webkitpy/style/checkers/js_unittest.py

    r174136 r252440  
    3232import unittest
    3333
    34 from js import JSChecker
     34from webkitpy.style.checkers.js import JSChecker
    3535
    3636

  • trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py

    r240251 r252440  
    2525import json
    2626import re
    27 from sets import Set
    2827
    2928
    … …  
    7170                return
    7271
    73             specification_name_set = Set()
     72            specification_name_set = set()
    7473            if 'specification' in features_definition:
    7574                previous_specification_name = ''

  • trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py

    r174136 r252440  
    2323"""Unit test for jsonchecker.py."""
    2424
     25import sys
    2526import unittest
    2627
    27 import jsonchecker
     28from webkitpy.style.checkers import jsonchecker
    2829
    2930
    … …  
    8283
    8384    def test_conflict_marker(self):
    84         self.assert_error(0, 'json/syntax', '<<<<<<< HEAD\n{\n}\n')
     85        # Python 2 0 indexes json parser errors, Python 3 1 indexes them
     86        self.assert_error(1 if sys.version_info > (3, 0) else 0, 'json/syntax', '<<<<<<< HEAD\n{\n}\n')
    8587
    8688    def test_single_quote(self):

  • trunk/Tools/Scripts/webkitpy/style/checkers/jstest_unittest.py

    r216110 r252440  
    2626import unittest
    2727
    28 from jstest import map_functions_to_dict
     28from webkitpy.style.checkers.jstest import map_functions_to_dict
    2929
    3030

  • trunk/Tools/Scripts/webkitpy/style/checkers/messagesin.py

    r160093 r252440  
    2626
    2727import re
    28 from common import TabChecker
     28from webkitpy.style.checkers.common import TabChecker
    2929
    3030

  • trunk/Tools/Scripts/webkitpy/style/checkers/messagesin_unittest.py

    r174136 r252440  
    2727import unittest
    2828
    29 from messagesin import MessagesInChecker
     29from webkitpy.style.checkers.messagesin import MessagesInChecker
    3030
    3131

  • trunk/Tools/Scripts/webkitpy/style/checkers/png_unittest.py

    r174136 r252440  
    2626import unittest
    2727
    28 from png import PNGChecker
     28from webkitpy.style.checkers.png import PNGChecker
    2929from webkitpy.common.system.filesystem_mock import MockFileSystem
    3030from webkitpy.common.system.systemhost_mock import MockSystemHost

  • trunk/Tools/Scripts/webkitpy/style/checkers/python.py

    r247538 r252440  
    2525
    2626import re
    27 from StringIO import StringIO
     27import sys
    2828
    2929from webkitpy.common.system.filesystem import FileSystem
     30from webkitpy.common.unicode_compatibility import StringIO
     31from webkitpy.common.system.outputcapture import OutputCaptureScope
    3032from webkitpy.common.webkit_finder import WebKitFinder
    3133from webkitpy.thirdparty.autoinstalled import pep8
    32 from webkitpy.thirdparty.autoinstalled.pylint import lint
    33 from webkitpy.thirdparty.autoinstalled.pylint.reporters.text import ParseableTextReporter
    3434
    3535
    … …  
    4242    def check(self, lines):
    4343        self._check_pep8(lines)
    44         self._check_pylint(lines)
     44        # FIXME: https://bugs.webkit.org/show_bug.cgi?id=204133
     45        # Pylint can't live happily in python 2 and 3 world, we need to pick one
     46        if sys.version_info < (3, 0):
     47            self._check_pylint(lines)
    4548
    4649    def _check_pep8(self, lines):
    … …  
    7275        output = pylinter.run(['-E', self._file_path])
    7376
    74         lint_regex = re.compile('([^:]+):([^:]+): \[([^]]+)\] (.*)')
     77        lint_regex = re.compile(r'([^:]+):([^:]+): \[([^]]+)\] (.*)')
    7578        for error in output.getvalue().splitlines():
    7679            match_obj = lint_regex.match(error)
    77             assert(match_obj)
     80            if not match_obj:
     81                continue
    7882            line_number = int(match_obj.group(2))
    7983            category_and_method = match_obj.group(3).split(', ')
    … …  
    105109    def run(self, argv):
    106110        output = _FilteredStringIO(self.FALSE_POSITIVES)
    107         lint.Run(['--rcfile', self._pylintrc] + argv, reporter=ParseableTextReporter(output=output), exit=False)
     111        with OutputCaptureScope():
     112            from webkitpy.thirdparty.autoinstalled.pylint import lint
     113            from webkitpy.thirdparty.autoinstalled.pylint.reporters.text import ParseableTextReporter
     114            lint.Run(['--rcfile', self._pylintrc] + argv, reporter=ParseableTextReporter(output=output), exit=False)
    108115        return output
    109116

  • trunk/Tools/Scripts/webkitpy/style/checkers/python_unittest.py

    r174136 r252440  
    2424
    2525import os
     26import sys
    2627import unittest
    2728
    28 from python import PythonChecker
     29from webkitpy.style.checkers.python import PythonChecker
    2930
    3031
    … …  
    4748        errors = []
    4849
    49         def _mock_handle_style_error(line_number, category, confidence,
    50                                      message):
     50        def _mock_handle_style_error(line_number, category, confidence, message):
    5151            error = (line_number, category, confidence, message)
    5252            errors.append(error)
    … …  
    5858        checker.check(lines=[])
    5959
    60         self.assertEqual(errors, [
    61             (4, "pep8/W291", 5, "trailing whitespace"),
    62             (4, "pylint/E0602", 5, "Undefined variable 'error'"),
    63             ])
     60        # FIXME: https://bugs.webkit.org/show_bug.cgi?id=204133
     61        expected_errors = [(4, "pep8/W291", 5, "trailing whitespace")]
     62        if sys.version_info < (3, 0):
     63            expected_errors.append((4, "pylint/E0602", 5, "Undefined variable 'error'"))
     64
     65        self.assertEqual(errors, expected_errors)
    6466
    6567    def test_pylint_false_positives(self):

  • trunk/Tools/Scripts/webkitpy/style/checkers/python_unittest_falsepositives.py

    r152639 r252440  
    66
    77def test_popen(proc):
    8     p = subprocess.Popen(proc, stdout=subprocess.PIPE,
    9                              stderr=subprocess.STDOUT)
     8    p = subprocess.Popen(
     9        proc,
     10        stdout=subprocess.PIPE,
     11        stderr=subprocess.STDOUT,
     12    )
    1013    tmp1 = p.poll
    1114    tmp2 = p.returncode

  • trunk/Tools/Scripts/webkitpy/style/checkers/python_unittest_input.py

    r134309 r252440  
    22# problems, one that will generate a PEP-8 warning for trailing whitespace
    33# and one that will generate a pylint error for an undefined variable.
    4 print error()
     4print(error())

  • trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations.py

    r220158 r252440  
    3535import sys
    3636
    37 from common import TabChecker
    3837from webkitpy.common.host import Host
    3938from webkitpy.layout_tests.models import test_expectations
     39from webkitpy.style.checkers.common import TabChecker
    4040from webkitpy.style.error_handlers import DefaultStyleErrorHandler
    4141

  • trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

    r215758 r252440  
    3131import unittest
    3232
    33 from test_expectations import TestExpectationsChecker
    3433from webkitpy.common.host_mock import MockHost
     34from webkitpy.style.checkers.test_expectations import TestExpectationsChecker
    3535
    3636

  • trunk/Tools/Scripts/webkitpy/style/checkers/text.py

    r202362 r252440  
    3030"""Checks WebKit style for text files."""
    3131
    32 from common import TabChecker
     32from webkitpy.style.checkers.common import TabChecker
    3333
    3434

  • trunk/Tools/Scripts/webkitpy/style/checkers/text_unittest.py

    r202362 r252440  
    3131import unittest
    3232
    33 import text as text_style
    34 from text import TextChecker
     33from webkitpy.style.checkers import text as text_style
     34from webkitpy.style.checkers.text import TextChecker
    3535
    3636

  • trunk/Tools/Scripts/webkitpy/style/checkers/watchlist_unittest.py

    r174136 r252440  
    3434import unittest
    3535
    36 
    37 import watchlist
     36from webkitpy.style.checkers import watchlist
    3837
    3938

  • trunk/Tools/Scripts/webkitpy/style/checkers/xcodeproj_unittest.py

    r237566 r252440  
    2525
    2626import unittest
    27 import xcodeproj
     27from webkitpy.style.checkers import xcodeproj
    2828
    2929

  • trunk/Tools/Scripts/webkitpy/style/checkers/xml_unittest.py

    r174136 r252440  
    2424
    2525import unittest
    26 import xml
     26from webkitpy.style.checkers import xml
    2727
    2828

  • trunk/Tools/Scripts/webkitpy/style/optparser.py

    r225733 r252440  
    2828import sys
    2929
    30 from filter import validate_filter_rules
     30from webkitpy.style.filter import validate_filter_rules
    3131# This module should not import anything from checker.py.
    3232

  • trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

    r252358 r252440  
    153153
    154154    def _install_pep8(self):
    155         self._install("https://files.pythonhosted.org/packages/source/p/pep8/pep8-0.5.0.tar.gz",
    156                              "pep8-0.5.0/pep8.py")
     155        self._install("https://files.pythonhosted.org/packages/01/a0/64ba19519db49e4094d82599412a9660dee8c26a7addbbb1bf17927ceefe/pep8-1.7.1.tar.gz",
     156                             "pep8-1.7.1/pep8.py")
    157157    def _install_pycodestyle(self):
    158158        self._install("https://files.pythonhosted.org/packages/source/p/pycodestyle/pycodestyle-2.5.0.tar.gz",
Note: See TracChangeset for help on using the changeset viewer.