Index: Tools/Scripts/webkitpy/style/checker.py |
diff --git a/Tools/Scripts/webkitpy/style/checker.py b/Tools/Scripts/webkitpy/style/checker.py |
index b3c38a5d65debe77cf0700ea8044d3974cdfbc12..55e8f933a94b374c255e1cb28c3c6d26706e8ea6 100644 |
--- a/Tools/Scripts/webkitpy/style/checker.py |
+++ b/Tools/Scripts/webkitpy/style/checker.py |
@@ -44,7 +44,6 @@ from checkers.png import PNGChecker |
from checkers.python import PythonChecker |
from checkers.test_expectations import TestExpectationsChecker |
from checkers.text import TextChecker |
-from checkers.watchlist import WatchListChecker |
from checkers.xcodeproj import XcodeProjectFileChecker |
from checkers.xml import XMLChecker |
from error_handlers import DefaultStyleErrorHandler |
@@ -511,13 +510,13 @@ class FileType: |
NONE = 0 # FileType.NONE evaluates to False. |
# Alphabetize remaining types |
- CHANGELOG = 1 |
+ # CHANGELOG = 1 |
CPP = 2 |
JSON = 3 |
PNG = 4 |
PYTHON = 5 |
TEXT = 6 |
- WATCHLIST = 7 |
+ # WATCHLIST = 7 |
XML = 8 |
XCODEPROJ = 9 |
CMAKE = 10 |
@@ -554,9 +553,7 @@ class CheckerDispatcher(object): |
if not self._file_type(file_path): # FileType.NONE. |
return True |
# Since "LayoutTests" is in _SKIPPED_FILES_WITHOUT_WARNING, make |
- # an exception to prevent files like "LayoutTests/ChangeLog" and |
- # "LayoutTests/ChangeLog-2009-06-16" from being skipped. |
- # Files like 'TestExpectations' are also should not be skipped. |
+ # an exception to prevent files like 'TestExpectations' from being skipped. |
# |
# FIXME: Figure out a good way to avoid having to add special logic |
# for this special case. |
@@ -589,10 +586,6 @@ class CheckerDispatcher(object): |
return FileType.PYTHON |
elif file_extension in _XML_FILE_EXTENSIONS: |
return FileType.XML |
- elif os.path.basename(file_path).startswith('ChangeLog'): |
- return FileType.CHANGELOG |
- elif os.path.basename(file_path) == 'watchlist': |
- return FileType.WATCHLIST |
elif file_extension == _XCODEPROJ_FILE_EXTENSION: |
return FileType.XCODEPROJ |
elif file_extension == _PNG_FILE_EXTENSION: |
@@ -610,8 +603,6 @@ class CheckerDispatcher(object): |
"""Instantiate and return a style checker based on file type.""" |
if file_type == FileType.NONE: |
checker = None |
- elif file_type == FileType.CHANGELOG: |
- checker = None |
elif file_type == FileType.CPP: |
file_extension = self._file_extension(file_path) |
checker = CppChecker(file_path, file_extension, |
@@ -634,8 +625,6 @@ class CheckerDispatcher(object): |
checker = TestExpectationsChecker(file_path, handle_style_error) |
else: |
checker = TextChecker(file_path, handle_style_error) |
- elif file_type == FileType.WATCHLIST: |
- checker = WatchListChecker(file_path, handle_style_error) |
else: |
raise ValueError('Invalid file type "%(file_type)s": the only valid file types ' |
"are %(NONE)s, %(CPP)s, and %(TEXT)s." |