Changeset 71667 in webkit

Timestamp:

Nov 9, 2010 12:24:12 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-09 James Kozianski <​koz@chromium.org>

Reviewed by Eric Seidel.

Clean up imports for webkit-patch.
​https://bugs.webkit.org/show_bug.cgi?id=49083

Move some imports from commands into main.py where they are used.
Move command imports into the init of the commands module.

• Scripts/webkitpy/tool/commands/init.py:
• Scripts/webkitpy/tool/commands/download.py:
• Scripts/webkitpy/tool/commands/queues.py:
• Scripts/webkitpy/tool/main.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/__init__.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/queues.py (modified) (1 diff)
• Scripts/webkitpy/tool/main.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-09  James Kozianski  <koz@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Clean up imports for webkit-patch.
+        https://bugs.webkit.org/show_bug.cgi?id=49083
+
+        Move some imports from commands into main.py where they are used.
+        Move command imports into the __init__ of the commands module.
+
+        * Scripts/webkitpy/tool/commands/__init__.py:
+        * Scripts/webkitpy/tool/commands/download.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/main.py:
+
 2010-11-09  Yi Shen  <yi.4.shen@nokia.com>
 

trunk/WebKitTools/Scripts/webkitpy/tool/commands/__init__.py

@@ -1 +1 @@
 # Required for Python to search this directory for module files
 
+from webkitpy.tool.commands.download import *
+from webkitpy.tool.commands.earlywarningsystem import *
+from webkitpy.tool.commands.openbugs import OpenBugs
 from webkitpy.tool.commands.prettydiff import PrettyDiff
+from webkitpy.tool.commands.queries import *
+from webkitpy.tool.commands.queues import *
 from webkitpy.tool.commands.rebaseline import Rebaseline
 from webkitpy.tool.commands.rebaselineserver import RebaselineServer
-# FIXME: Add the rest of the commands here.
+from webkitpy.tool.commands.sheriffbot import *
+from webkitpy.tool.commands.upload import *

trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py

@@ -30 +30 @@
 import os
 
-from optparse import make_option
-
 import webkitpy.tool.steps as steps
 

trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py

@@ -42 +42 @@
 from webkitpy.common.net.layouttestresults import path_for_layout_test, LayoutTestResults
 from webkitpy.common.net.statusserver import StatusServer
+from webkitpy.common.system.deprecated_logging import error, log
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.system.deprecated_logging import error, log
-from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler
 from webkitpy.tool.bot.commitqueuetask import CommitQueueTask, CommitQueueTaskDelegate
 from webkitpy.tool.bot.feeders import CommitQueueFeeder, EWSFeeder
 from webkitpy.tool.bot.queueengine import QueueEngine, QueueEngineDelegate
+from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler
 from webkitpy.tool.grammar import pluralize, join_with_separators
 from webkitpy.tool.multicommandtool import Command, TryAgain

trunk/WebKitTools/Scripts/webkitpy/tool/main.py

@@ -30 +30 @@
 # A tool for automating dealing with bugzilla, posting patches, committing patches, etc.
 
+from optparse import make_option
 import os
 import threading
@@ -39 +40 @@
 from webkitpy.common.net.buildbot import BuildBot
 from webkitpy.common.net.irc.ircproxy import IRCProxy
+from webkitpy.common.net.statusserver import StatusServer
 from webkitpy.common.system.executive import Executive
 from webkitpy.common.system.user import User
 from webkitpy.layout_tests import port
+from webkitpy.tool.multicommandtool import MultiCommandTool
 import webkitpy.tool.commands as commands
-# FIXME: Remove these imports once all the commands are in the root of the
-# command package.
-from webkitpy.tool.commands.download import *
-from webkitpy.tool.commands.earlywarningsystem import *
-from webkitpy.tool.commands.openbugs import OpenBugs
-from webkitpy.tool.commands.queries import *
-from webkitpy.tool.commands.queues import *
-from webkitpy.tool.commands.sheriffbot import *
-from webkitpy.tool.commands.upload import *
-from webkitpy.tool.multicommandtool import MultiCommandTool