third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py - Issue 2064313003: Rename files in webkitpy/tool to have underscores between words (for consistency).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py

Issue 2064313003: Rename files in webkitpy/tool to have underscores between words (for consistency). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/tool/mocktool_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py

similarity index 97%

rename from third_party/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py

rename to third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py

index 1e1261902127a89b6f9fab7e63ac54af2ae0bb00..e65297f7b3c0965d9dbcb0830f82f676f9131253 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/multicommandtool.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/multi_command_tool.py

@@ -37,7 +37,7 @@ import sys

from webkitpy.tool.commands.command import Command

from webkitpy.tool.commands.command import HelpPrintingOptionParser

-from webkitpy.tool.commands.helpcommand import HelpCommand

+from webkitpy.tool.commands.help_command import HelpCommand

_log = logging.getLogger(__name__)

@@ -115,7 +115,7 @@ class MultiCommandTool(object):

return command.show_in_main_help

def should_execute_command(self, command): # Argument may be used in subclasses - pylint: disable=unused-argument

- return True

+ return (True, None)

def _add_global_options(self, option_parser):

global_options = self.global_options or []

@@ -125,7 +125,8 @@ class MultiCommandTool(object):

def handle_global_options(self, options):

pass

- def main(self, argv=sys.argv):

+ def main(self, argv=None):

+ argv = argv or sys.argv

(command_name, args) = self._split_command_name_from_args(argv[1:])

option_parser = self._create_option_parser()

@@ -148,7 +149,7 @@ class MultiCommandTool(object):

try:

result = command.check_arguments_and_execute(options, args, self)

break

- except TryAgain as e:

+ except TryAgain:

pass

self.command_completed()