Diff
Modified: trunk/Tools/ChangeLog (202318 => 202319)
--- trunk/Tools/ChangeLog 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/ChangeLog 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,3 +1,134 @@
+2016-06-21 Aakash Jain <aakash_j...@apple.com>
+
+ Fix formatting issues reported by check-webkit-style
+ https://bugs.webkit.org/show_bug.cgi?id=159008
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fixed the formatting issues as reported by check-webkit-style in webkitpy/tool folder.
+ There is no functionality change.
+
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ (Restart.execute):
+ (Rollout):
+ * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
+ (IRCBotTest.test_exception_during_command):
+ (IRCBotTest.test_exception_during_command.CommandWithException):
+ (IRCBotTest.test_exception_during_command.CommandWithException.execute):
+ * Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py:
+ (test_missing_unit_test_results_path):
+ (test_layout_test_results):
+ * Scripts/webkitpy/tool/bot/queueengine.py:
+ * Scripts/webkitpy/tool/bot/queueengine_unittest.py:
+ * Scripts/webkitpy/tool/commands/abstractsequencedcommand.py:
+ (AbstractSequencedCommand):
+ (AbstractSequencedCommand.__init__):
+ * Scripts/webkitpy/tool/commands/download.py:
+ (Land):
+ * Scripts/webkitpy/tool/commands/openbugs.py:
+ * Scripts/webkitpy/tool/commands/openbugs_unittest.py:
+ (OpenBugsTest):
+ * Scripts/webkitpy/tool/commands/queries.py:
+ (PatchesToCommitQueue):
+ (PatchesToCommitQueue.__init__):
+ (PatchesToCommitQueue._needs_commit_queue):
+ * Scripts/webkitpy/tool/commands/queries_unittest.py:
+ (PrintExpectationsTest.test_platform):
+ (PrintBaselinesTest):
+ (PrintBaselinesTest.setUp):
+ * Scripts/webkitpy/tool/commands/queues.py:
+ (AbstractQueue):
+ (AbstractQueue.__init__):
+ (AbstractQueue.execute):
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (test_auto_retry):
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ (AbstractParallelRebaselineCommand._files_to_add):
+ (AbstractParallelRebaselineCommand):
+ (AbstractParallelRebaselineCommand._rebaseline):
+ * Scripts/webkitpy/tool/commands/setupgitclone.py:
+ (SetupGitClone):
+ * Scripts/webkitpy/tool/commands/sheriffbot.py:
+ * Scripts/webkitpy/tool/commands/stepsequence.py:
+ * Scripts/webkitpy/tool/commands/upload.py:
+ (PostCommits._comment_text_for_commit):
+ (PostCommits):
+ (PostCommits.execute):
+ (MarkBugFixed):
+ (MarkBugFixed.__init__):
+ * Scripts/webkitpy/tool/commands/upload_unittest.py:
+ (UploadCommandsTest):
+ (UploadCommandsTest.test_commit_message_for_current_diff):
+ * Scripts/webkitpy/tool/grammar_unittest.py:
+ (GrammarTest):
+ (GrammarTest.test_join_with_separators):
+ * Scripts/webkitpy/tool/multicommandtool.py:
+ (HelpCommand.__init__):
+ (HelpCommand):
+ (HelpCommand._help_epilog):
+ (HelpCommand._remove_help_options):
+ (MultiCommandTool):
+ (MultiCommandTool.__init__):
+ (MultiCommandTool.main):
+ * Scripts/webkitpy/tool/multicommandtool_unittest.py:
+ (TrivialCommand):
+ (TrivialCommand.__init__):
+ (MultiCommandToolTest):
+ (MultiCommandToolTest._assert_tool_main_outputs):
+ (MultiCommandToolTest.test_retry):
+ (test_command_help):
+ * Scripts/webkitpy/tool/steps/__init__.py:
+ * Scripts/webkitpy/tool/steps/abstractstep.py:
+ * Scripts/webkitpy/tool/steps/applypatch.py:
+ * Scripts/webkitpy/tool/steps/applypatchwithlocalcommit.py:
+ (ApplyPatchWithLocalCommit):
+ (ApplyPatchWithLocalCommit.options):
+ * Scripts/webkitpy/tool/steps/build.py:
+ * Scripts/webkitpy/tool/steps/checkstyle.py:
+ (CheckStyle):
+ (CheckStyle.options):
+ * Scripts/webkitpy/tool/steps/cleanworkingdirectory.py:
+ * Scripts/webkitpy/tool/steps/closebug.py:
+ * Scripts/webkitpy/tool/steps/closebugforlanddiff.py:
+ * Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
+ (CloseBugForLandDiffTest):
+ (CloseBugForLandDiffTest.test_empty_state):
+ * Scripts/webkitpy/tool/steps/closepatch.py:
+ * Scripts/webkitpy/tool/steps/commit.py:
+ (Commit.run):
+ * Scripts/webkitpy/tool/steps/confirmdiff.py:
+ * Scripts/webkitpy/tool/steps/editchangelog.py:
+ * Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py:
+ * Scripts/webkitpy/tool/steps/metastep.py:
+ (MetaStep):
+ (MetaStep.__init__):
+ (MetaStep.run):
+ * Scripts/webkitpy/tool/steps/obsoletepatches.py:
+ * Scripts/webkitpy/tool/steps/options.py:
+ (Options):
+ * Scripts/webkitpy/tool/steps/postdiff.py:
+ * Scripts/webkitpy/tool/steps/postdiffforcommit.py:
+ * Scripts/webkitpy/tool/steps/postdiffforrevert.py:
+ * Scripts/webkitpy/tool/steps/preparechangelog.py:
+ * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
+ (PrepareChangeLogTest):
+ (PrepareChangeLogTest.test_resolve_existing_entry):
+ * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
+ * Scripts/webkitpy/tool/steps/promptforbugortitle.py:
+ * Scripts/webkitpy/tool/steps/reopenbugafterrollout.py:
+ * Scripts/webkitpy/tool/steps/revertrevision.py:
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ * Scripts/webkitpy/tool/steps/runtests_unittest.py:
+ * Scripts/webkitpy/tool/steps/steps_unittest.py:
+ (StepsTest):
+ (StepsTest._step_options):
+ * Scripts/webkitpy/tool/steps/update.py:
+ * Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
+ (UpdateChangeLogsWithReviewerTest):
+ (UpdateChangeLogsWithReviewerTest.test_guess_reviewer_from_bug):
+ * Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
+ * Scripts/webkitpy/tool/steps/validatereviewer.py:
+
2016-06-21 Chris Dumez <cdu...@apple.com>
Unreviewed, rolling out r202296.
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -148,6 +148,7 @@
tool.irc().post("Restarting...")
raise TerminateQueue()
+
class Rollout(IRCCommand):
usage_string = "rollout SVN_REVISION [SVN_REVISIONS] REASON"
help_string = "Opens a rollout bug, CCing author + reviewer, and attaching the reverse-diff of the given revisions marked as commit-queue=?."
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -74,6 +74,7 @@
expected_logs = 'MOCK: irc.post: Exception executing command: mock_exception\n'
OutputCapture().assert_outputs(self, bot.process_message, args=["mock_nick", "ignored message"], expected_logs=expected_logs)
+
class CommandWithException(object):
def execute(self, nick, args, tool, sheriff):
raise KeyboardInterrupt()
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/layouttestresultsreader_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -74,7 +74,6 @@
self.assertIsNotNone(reader.results(), None)
self.assertEqual(reader.results().failing_tests(), [])
-
def test_layout_test_results(self):
reader = LayoutTestResultsReader(MockHost(), "/mock-results", "/var/logs")
reader._read_file_contents = lambda path: None
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -4,7 +4,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -3,7 +3,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -3,7 +3,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -37,6 +37,7 @@
class AbstractSequencedCommand(Command):
steps = None
+
def __init__(self):
self._sequence = StepSequence(self.steps)
Command.__init__(self, self._sequence.options())
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/download.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/download.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -96,7 +96,7 @@
steps.AddSvnMimetypeForPng,
steps.UpdateChangeLogsWithReviewer,
steps.ValidateReviewer,
- steps.ValidateChangeLogs, # We do this after UpdateChangeLogsWithReviewer to avoid not having to cache the diff twice.
+ steps.ValidateChangeLogs, # We do this after UpdateChangeLogsWithReviewer to avoid not having to cache the diff twice.
steps.Build,
steps.RunTests,
steps.Commit,
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/openbugs.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/openbugs.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/openbugs.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -3,7 +3,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/openbugs_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/openbugs_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/openbugs_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -29,6 +29,7 @@
from webkitpy.tool.commands.commandtest import CommandsTest
from webkitpy.tool.commands.openbugs import OpenBugs
+
class OpenBugsTest(CommandsTest):
find_bugs_in_string_expectations = [
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -91,6 +91,7 @@
class PatchesToCommitQueue(Command):
name = "patches-to-commit-queue"
help_text = "Patches which should be added to the commit queue"
+
def __init__(self):
options = [
make_option("--bugs", action="" dest="bugs", help="Output bug links instead of patch links"),
@@ -99,7 +100,7 @@
@staticmethod
def _needs_commit_queue(patch):
- if patch.commit_queue() == "+": # If it's already cq+, ignore the patch.
+ if patch.commit_queue() == "+": # If it's already cq+, ignore the patch.
_log.info("%s already has cq=%s" % (patch.id(), patch.commit_queue()))
return False
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -237,6 +237,7 @@
'platform/test-mac-leopard/http/test.html [ Pass ]\n'),
platform='test-mac-*')
+
class PrintBaselinesTest(unittest.TestCase):
def setUp(self):
self.oc = None
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -66,7 +66,7 @@
_fail_status = "Fail"
_error_status = "Error"
- def __init__(self, options=None): # Default values should never be collections (like []) as default values are shared between invocations
+ def __init__(self, options=None): # Default values should never be collections (like []) as default values are shared between invocations
options_list = (options or []) + [
make_option("--no-confirm", action="" dest="confirm", default=True, help="Do not ask the user for confirmation before running the queue. Dangerous!"),
make_option("--exit-after-iteration", action="" type="int", dest="iterations", default=None, help="Stop running the queue after iterating this number of times."),
@@ -148,7 +148,7 @@
# Command methods
def execute(self, options, args, tool, engine=QueueEngine):
- self._options = options # FIXME: This code is wrong. Command.options is a list, this assumes an Options element!
+ self._options = options # FIXME: This code is wrong. Command.options is a list, this assumes an Options element!
self._tool = tool # FIXME: This code is wrong too! Command.bind_to_tool handles this!
return engine(self.name, self, self._tool.wakeup_event, self._options.seconds_to_sleep).run()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -385,7 +385,6 @@
}
self.assert_queue_outputs(CommitQueue(), tool=tool, work_item=patch, expected_logs=expected_logs)
-
def test_auto_retry(self):
queue = CommitQueue()
options = Mock()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -265,7 +265,6 @@
if not file_added:
_log.debug('Could not add file based off output "%s"' % output)
-
return list(files_to_add)
def _rebaseline(self, options, test_list):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/setupgitclone.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -30,6 +30,7 @@
from webkitpy.common.checkout.scm.git import Git
from webkitpy.common.system.executive import ScriptError
+
class SetupGitClone(Command):
name = "setup-git-clone"
help_text = "Configures a new Git clone for the WebKit development"
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -3,7 +3,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/stepsequence.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2009 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/upload.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -4,7 +4,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -332,7 +332,7 @@
def execute(self, options, args, tool):
commit_ids = tool.scm().commit_ids_from_commitish_arguments(args)
- if len(commit_ids) > 10: # We could lower this limit, 10 is too many for one bug as-is.
+ if len(commit_ids) > 10: # We could lower this limit, 10 is too many for one bug as-is.
_log.error("webkit-patch does not support attaching %s at once. Are you sure you passed the right commit range?" % (pluralize(len(commit_ids), "patch")))
sys.exit(1)
@@ -362,6 +362,7 @@
name = "mark-bug-fixed"
help_text = "Mark the specified bug as fixed"
argument_names = "[SVN_REVISION]"
+
def __init__(self):
options = [
make_option("--bug-id", action="" type="string", dest="bug_id", help="Specify bug id if no URL is provided in the commit log."),
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -31,6 +31,7 @@
from webkitpy.tool.commands.upload import *
from webkitpy.tool.mocktool import MockOptions, MockTool
+
class UploadCommandsTest(CommandsTest):
def test_commit_message_for_current_diff(self):
tool = MockTool()
Modified: trunk/Tools/Scripts/webkitpy/tool/grammar_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/grammar_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/grammar_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -32,6 +32,7 @@
from webkitpy.tool.grammar import plural
from webkitpy.tool.grammar import pluralize
+
class GrammarTest(unittest.TestCase):
def test_join_with_separators(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/multicommandtool.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/multicommandtool.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/multicommandtool.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -4,7 +4,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -170,7 +170,7 @@
make_option("-a", "--all-commands", action="" dest="show_all_commands", help="Print all available commands"),
]
Command.__init__(self, options)
- self.show_all_commands = False # A hack used to pass --all-commands to _help_epilog even though it's called by the OptionParser.
+ self.show_all_commands = False # A hack used to pass --all-commands to _help_epilog even though it's called by the OptionParser.
def _help_epilog(self):
# Only show commands which are relevant to this checkout's SCM system. Might this be confusing to some users?
@@ -186,7 +186,7 @@
epilog += "%s\n" % "".join(command_help_texts)
epilog += "See '%prog help --all-commands' to list all commands.\n"
epilog += "See '%prog help COMMAND' for more information on a specific command.\n"
- return epilog.replace("%prog", self._tool.name()) # Use of %prog here mimics OptionParser.expand_prog_name().
+ return epilog.replace("%prog", self._tool.name()) # Use of %prog here mimics OptionParser.expand_prog_name().
# FIXME: This is a hack so that we don't show --all-commands as a global option:
def _remove_help_options(self):
@@ -210,7 +210,7 @@
global_options = None
def __init__(self, name=None, commands=None):
- self._name = name or OptionParser(prog=name).get_prog_name() # OptionParser has nice logic for fetching the name.
+ self._name = name or OptionParser(prog=name).get_prog_name() # OptionParser has nice logic for fetching the name.
# Allow the unit tests to disable command auto-discovery.
self.commands = commands or [cls() for cls in self._find_all_commands() if cls.name]
self.help_command = self.command_by_name(HelpCommand.name)
@@ -298,7 +298,7 @@
(should_execute, failure_reason) = self.should_execute_command(command)
if not should_execute:
_log.error(failure_reason)
- return 0 # FIXME: Should this really be 0?
+ return 0 # FIXME: Should this really be 0?
while True:
try:
Modified: trunk/Tools/Scripts/webkitpy/tool/multicommandtool_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/multicommandtool_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/multicommandtool_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -3,7 +3,7 @@
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -39,6 +39,7 @@
name = "trivial"
show_in_main_help = True
help_text = "help text"
+
def __init__(self, **kwargs):
Command.__init__(self, **kwargs)
@@ -127,7 +128,7 @@
self.assertEqual(tool.command_by_name("trivial").name, "trivial")
self.assertEqual(tool.command_by_name("bar"), None)
- def _assert_tool_main_outputs(self, tool, main_args, expected_stdout, expected_stderr = "", expected_exit_code=0):
+ def _assert_tool_main_outputs(self, tool, main_args, expected_stdout, expected_stderr="", expected_exit_code=0):
exit_code = OutputCapture().assert_outputs(self, tool.main, [main_args], expected_stdout=expected_stdout, expected_stderr=expected_stderr)
self.assertEqual(exit_code, expected_exit_code)
@@ -171,7 +172,6 @@
# Test that arguments can be passed before commands as well
self._assert_tool_main_outputs(tool, ["tool", "--all-commands", "help"], expected_all_commands_help)
-
def test_command_help(self):
TrivialCommand.long_help = "LONG HELP"
command_with_options = TrivialCommand(options=[make_option("--my_option")])
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/__init__.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/applypatch.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/applypatch.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/applypatch.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/applypatchwithlocalcommit.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/applypatchwithlocalcommit.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/applypatchwithlocalcommit.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -29,6 +29,7 @@
from webkitpy.tool.steps.applypatch import ApplyPatch
from webkitpy.tool.steps.options import Options
+
class ApplyPatchWithLocalCommit(ApplyPatch):
@classmethod
def options(cls):
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/build.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/build.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -30,6 +30,7 @@
from webkitpy.tool.steps.abstractstep import AbstractStep
from webkitpy.tool.steps.options import Options
+
class CheckStyle(AbstractStep):
@classmethod
def options(cls):
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/closebug.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/closebug.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/closebug.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -32,6 +32,7 @@
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool.steps.closebugforlanddiff import CloseBugForLandDiff
+
class CloseBugForLandDiffTest(unittest.TestCase):
def test_empty_state(self):
capture = OutputCapture()
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/closepatch.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/closepatch.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/closepatch.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/commit.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/commit.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -89,7 +89,7 @@
svn_revision = scm.svn_revision_from_commit_text(commit_text)
_log.info("Committed r%s: <%s>" % (svn_revision, urls.view_revision_url(svn_revision)))
self._state["commit_text"] = commit_text
- break;
+ break
except AmbiguousCommitError, e:
if self._tool.user.confirm(self._commit_warning(e)):
force_squash = True
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/editchangelog.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/editchangelog.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/editchangelog.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/metastep.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/metastep.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/metastep.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -31,7 +31,8 @@
# FIXME: Unify with StepSequence? I'm not sure yet which is the better design.
class MetaStep(AbstractStep):
- substeps = [] # Override in subclasses
+ substeps = [] # Override in subclasses
+
def __init__(self, tool, options):
AbstractStep.__init__(self, tool, options)
self._step_instances = []
@@ -51,4 +52,4 @@
def run(self, state):
for step in self._step_instances:
- step.run(state)
+ step.run(state)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/obsoletepatches.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/obsoletepatches.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/obsoletepatches.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/options.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/options.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -28,6 +28,7 @@
from optparse import make_option
+
class Options(object):
architecture = make_option("--architecture", action="" type="string", dest="architecture", default=None, help="Target architecture")
blocks = make_option("--blocks", action="" type="string", dest="blocks", default=None, help="Bug number which the created bug blocks.")
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/postdiff.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/postdiff.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/postdiff.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforcommit.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/postdiffforrevert.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -36,6 +36,7 @@
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool.steps.preparechangelog import PrepareChangeLog
+
class PrepareChangeLogTest(changelog_unittest.ChangeLogTest):
def test_resolve_existing_entry(self):
step = PrepareChangeLog(MockTool(), MockOptions())
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/promptforbugortitle.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/promptforbugortitle.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/promptforbugortitle.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/revertrevision.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/revertrevision.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/revertrevision.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -40,6 +40,7 @@
_log = logging.getLogger(__name__)
+
class RunTests(AbstractStep):
# FIXME: This knowledge really belongs in the commit-queue.
NON_INTERACTIVE_FAILURE_LIMIT_COUNT = 30
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -34,6 +34,7 @@
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool.steps.runtests import RunTests
+
class RunTestsTest(unittest.TestCase):
def test_webkit_run_unit_tests(self):
tool = MockTool(log_executive=True)
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -34,6 +34,7 @@
from webkitpy.tool import steps
+
class StepsTest(unittest.TestCase):
def _step_options(self):
options = MockOptions()
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/update.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/update.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/update.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -32,6 +32,7 @@
from webkitpy.tool.mocktool import MockOptions, MockTool
from webkitpy.tool.steps.updatechangelogswithreviewer import UpdateChangeLogsWithReviewer
+
class UpdateChangeLogsWithReviewerTest(unittest.TestCase):
def test_guess_reviewer_from_bug(self):
capture = OutputCapture()
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
Modified: trunk/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py (202318 => 202319)
--- trunk/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py 2016-06-22 03:26:57 UTC (rev 202318)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py 2016-06-22 03:34:05 UTC (rev 202319)
@@ -1,9 +1,9 @@
# Copyright (C) 2010 Google Inc. All rights reserved.
-#
+#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
-#
+#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
@@ -13,7 +13,7 @@
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
-#
+#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
