2011-02-07 Tony Chang <tony@chromium.org>

        Reviewed by Adam Barth.

        clean up python imports
        https://bugs.webkit.org/show_bug.cgi?id=53966

        Convert "import A.B.C.D as D" to "from A.B.C import D" and
        make some imports absolute as required by PEP-8

        * Scripts/webkitpy/common/checkout/scm.py:
        * Scripts/webkitpy/common/net/irc/ircbot.py:
        * Scripts/webkitpy/common/system/logutils.py:
        * Scripts/webkitpy/common/system/logutils_unittest.py:
        * Scripts/webkitpy/layout_tests/deduplicate_tests.py:
        * Scripts/webkitpy/layout_tests/port/chromium.py:
        * Scripts/webkitpy/layout_tests/port/mac.py: Remove some unused imports
        * Scripts/webkitpy/layout_tests/port/webkit.py:
        * Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py:
        * Scripts/webkitpy/tool/bot/irc_command.py:
        * Scripts/webkitpy/tool/bot/sheriffircbot.py:
        * Scripts/webkitpy/tool/commands/download.py:
        * Scripts/webkitpy/tool/commands/prettydiff.py:
        * Scripts/webkitpy/tool/commands/queries.py:
        * Scripts/webkitpy/tool/commands/roll.py:
        * Scripts/webkitpy/tool/commands/stepsequence.py:
        * Scripts/webkitpy/tool/commands/upload.py:
        * Scripts/webkitpy/tool/main.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@77913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8bc994b63bc92b716fc6ebea9189e0bf20197f9e..79716f903018af812caec15f9c9ea29b574daac0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,32 @@
+2011-02-07  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        clean up python imports
+        https://bugs.webkit.org/show_bug.cgi?id=53966
+
+        Convert "import A.B.C.D as D" to "from A.B.C import D" and
+        make some imports absolute as required by PEP-8
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/net/irc/ircbot.py:
+        * Scripts/webkitpy/common/system/logutils.py:
+        * Scripts/webkitpy/common/system/logutils_unittest.py:
+        * Scripts/webkitpy/layout_tests/deduplicate_tests.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/mac.py: Remove some unused imports
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py:
+        * Scripts/webkitpy/tool/bot/irc_command.py:
+        * Scripts/webkitpy/tool/bot/sheriffircbot.py:
+        * Scripts/webkitpy/tool/commands/download.py:
+        * Scripts/webkitpy/tool/commands/prettydiff.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/commands/roll.py:
+        * Scripts/webkitpy/tool/commands/stepsequence.py:
+        * Scripts/webkitpy/tool/commands/upload.py:
+        * Scripts/webkitpy/tool/main.py:
+
 2011-02-07  James Robinson  <jamesr@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/Tools/Scripts/webkitpy/common/checkout/scm.py b/Tools/Scripts/webkitpy/common/checkout/scm.py
index 6decdca3661f0f97ae86e20f225946a44b5d5185..3fa2db5b1655b48298c9d62a332b7be51949144c 100644 (file)
--- a/Tools/Scripts/webkitpy/common/checkout/scm.py
+++ b/Tools/Scripts/webkitpy/common/checkout/scm.py
@@ -34,10 +34,10 @@ import re
 import sys
 import shutil
 
-from webkitpy.common.system.executive import Executive, run_command, ScriptError
-from webkitpy.common.system.deprecated_logging import error, log
-import webkitpy.common.system.ospath as ospath
 from webkitpy.common.memoized import memoized
+from webkitpy.common.system.deprecated_logging import error, log
+from webkitpy.common.system.executive import Executive, run_command, ScriptError
+from webkitpy.common.system import ospath
 
 
 def find_checkout_root():

diff --git a/Tools/Scripts/webkitpy/common/net/irc/ircbot.py b/Tools/Scripts/webkitpy/common/net/irc/ircbot.py
index f7428672141d379ebc5c8946bf392b4d6996cca5..061a43cf62b86a0278c6c5888d65153271863d24 100644 (file)
--- a/Tools/Scripts/webkitpy/common/net/irc/ircbot.py
+++ b/Tools/Scripts/webkitpy/common/net/irc/ircbot.py
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import webkitpy.common.config.irc as config_irc
+from webkitpy.common.config import irc as config_irc
 
 from webkitpy.common.thread.messagepump import MessagePump, MessagePumpDelegate
 from webkitpy.thirdparty.autoinstalled.irc import ircbot

diff --git a/Tools/Scripts/webkitpy/common/system/logutils.py b/Tools/Scripts/webkitpy/common/system/logutils.py
index cd4e60f6532291bab125c0b51989b1c552e626eb..eef463693635d8700bceb417abccbd3ac8420576 100644 (file)
--- a/Tools/Scripts/webkitpy/common/system/logutils.py
+++ b/Tools/Scripts/webkitpy/common/system/logutils.py
@@ -83,7 +83,7 @@ def get_logger(path):
 
     Sample usage:
 
-      import webkitpy.common.system.logutils as logutils
+      from webkitpy.common.system import logutils
 
       _log = logutils.get_logger(__file__)
 

diff --git a/Tools/Scripts/webkitpy/common/system/logutils_unittest.py b/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
index b77c28419c83e84916cabde0838a25a81d6b4224..f1b494d4dedc8fa5cd3a93de884b92257dac7e16 100644 (file)
--- a/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
+++ b/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
@@ -28,7 +28,7 @@ import unittest
 
 from webkitpy.common.system.logtesting import LogTesting
 from webkitpy.common.system.logtesting import TestLogStream
-import webkitpy.common.system.logutils as logutils
+from webkitpy.common.system import logutils
 
 
 class GetLoggerTest(unittest.TestCase):

diff --git a/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py b/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py
index 51dcac8f1e1af0756d5e1390250f2f98c0f1e177..86649b6eaaeb50d54e0692404b7bcd245704eba5 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/deduplicate_tests.py
@@ -36,11 +36,12 @@ import os
 import subprocess
 import sys
 import re
-import webkitpy.common.checkout.scm as scm
-import webkitpy.common.system.executive as executive
-import webkitpy.common.system.logutils as logutils
-import webkitpy.common.system.ospath as ospath
-import webkitpy.layout_tests.port.factory as port_factory
+
+from webkitpy.common.checkout import scm
+from webkitpy.common.system import executive
+from webkitpy.common.system import logutils
+from webkitpy.common.system import ospath
+from webkitpy.layout_tests.port import factory as port_factory
 
 _log = logutils.get_logger(__file__)
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
index 51e1b93c7911f0679062c1ce368479aab64f8938..7d56fa2334f363516e7dc5c470076c047b3862df 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -41,10 +41,9 @@ import webbrowser
 from webkitpy.common.system import executive
 from webkitpy.common.system.path import cygpath
 from webkitpy.layout_tests.layout_package import test_expectations
-
-import base
-import http_server
-import websocket_server
+from webkitpy.layout_tests.port import base
+from webkitpy.layout_tests.port import http_server
+from webkitpy.layout_tests.port import websocket_server
 
 _log = logging.getLogger("webkitpy.layout_tests.port.chromium")
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mac.py b/Tools/Scripts/webkitpy/layout_tests/port/mac.py
index 9c2e8b310b2e46bb6fb7b53289fb95a1d3b4e024..1398ed32a88da4ef0674b2df71b5ce163f7419bf 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -33,9 +33,7 @@ import os
 import platform
 import signal
 
-import webkitpy.common.system.ospath as ospath
-import webkitpy.layout_tests.port.server_process as server_process
-from webkitpy.layout_tests.port.webkit import WebKitPort, WebKitDriver
+from webkitpy.layout_tests.port.webkit import WebKitPort
 
 _log = logging.getLogger("webkitpy.layout_tests.port.mac")
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
index 446be79f7d6c691ebd87d638966461654d6fc666..65a047d9d5a83d29eac8b0f301aa2921ca395117 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -40,9 +40,9 @@ import sys
 import time
 import webbrowser
 
-import webkitpy.common.system.ospath as ospath
-import webkitpy.layout_tests.port.base as base
-import webkitpy.layout_tests.port.server_process as server_process
+from webkitpy.common.system import ospath
+from webkitpy.layout_tests.port import base
+from webkitpy.layout_tests.port import server_process
 
 _log = logging.getLogger("webkitpy.layout_tests.port.webkit")
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py b/Tools/Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py
index f4c8098c66293ed1c759c4b95d49214f5bf69f79..7267aa6cf077ab82c30392afd613eee94eb5a133 100755 (executable)
--- a/Tools/Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/update_webgl_conformance_tests.py
@@ -31,7 +31,7 @@ import optparse
 import os
 import re
 import sys
-import webkitpy.common.checkout.scm as scm
+from webkitpy.common.checkout import scm
 
 _log = logging.getLogger("webkitpy.layout_tests."
                          "update-webgl-conformance-tests")

diff --git a/Tools/Scripts/webkitpy/tool/bot/irc_command.py b/Tools/Scripts/webkitpy/tool/bot/irc_command.py
index 265974e098fb0f0d385879e1fac807a16c60ac28..67a1c44514a1efdf4972df904726f93cae46cc6c 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/bot/irc_command.py
+++ b/Tools/Scripts/webkitpy/tool/bot/irc_command.py
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import random
-import webkitpy.common.config.irc as config_irc
+from webkitpy.common.config import irc as config_irc
 
 from webkitpy.common.config import urls
 from webkitpy.common.net.bugzilla import parse_bug_id

diff --git a/Tools/Scripts/webkitpy/tool/bot/sheriffircbot.py b/Tools/Scripts/webkitpy/tool/bot/sheriffircbot.py
index de7722253bde22cba4ea12d8caccc54a9fb1d12c..29e89a8cdf386d7e9d42e2cdcebfdedd38e07f23 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/bot/sheriffircbot.py
+++ b/Tools/Scripts/webkitpy/tool/bot/sheriffircbot.py
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import webkitpy.tool.bot.irc_command as irc_command
+from webkitpy.tool.bot import irc_command
 
 from webkitpy.common.net.irc.ircbot import IRCBotDelegate
 from webkitpy.common.thread.threadedmessagequeue import ThreadedMessageQueue

diff --git a/Tools/Scripts/webkitpy/tool/commands/download.py b/Tools/Scripts/webkitpy/tool/commands/download.py
index 1b478bffaba649ecfd0ba717d7924732ba193f85..35484cdfcc3d0f041908f7c439be60f94b37660d 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/download.py
+++ b/Tools/Scripts/webkitpy/tool/commands/download.py
@@ -29,7 +29,7 @@
 
 import os
 
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
 from webkitpy.common.checkout.changelog import ChangeLog
 from webkitpy.common.config import urls

diff --git a/Tools/Scripts/webkitpy/tool/commands/prettydiff.py b/Tools/Scripts/webkitpy/tool/commands/prettydiff.py
index e3fc00c55f395d55bfc8af93126b1a33504bcf5c..67866f04a17fe48d6039e920b3299d823b2087e4 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/prettydiff.py
+++ b/Tools/Scripts/webkitpy/tool/commands/prettydiff.py
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from webkitpy.tool.commands.abstractsequencedcommand import AbstractSequencedCommand
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
 
 class PrettyDiff(AbstractSequencedCommand):

diff --git a/Tools/Scripts/webkitpy/tool/commands/queries.py b/Tools/Scripts/webkitpy/tool/commands/queries.py
index 733751ec738d69d94aa50e81d9dbefdd102ba9e0..57f90ae3b53645ee83c2ec2d3d8aa70b9db57974 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/queries.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queries.py
@@ -30,7 +30,7 @@
 
 from optparse import make_option
 
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
 from webkitpy.common.checkout.commitinfo import CommitInfo
 from webkitpy.common.config.committers import CommitterList

diff --git a/Tools/Scripts/webkitpy/tool/commands/roll.py b/Tools/Scripts/webkitpy/tool/commands/roll.py
index 74f198f03509a776d9ce783bcbd191402296fc55..0cf95e9b216304e8f7165fb93cd21b2c187b3499 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/roll.py
+++ b/Tools/Scripts/webkitpy/tool/commands/roll.py
@@ -28,7 +28,7 @@
 
 from webkitpy.tool.commands.abstractsequencedcommand import AbstractSequencedCommand
 
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
 
 class RollChromiumDEPS(AbstractSequencedCommand):

diff --git a/Tools/Scripts/webkitpy/tool/commands/stepsequence.py b/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
index be2ed4c27025df82fc3d598fcb5d021c9071a020..b666554465eabe1142f23ca796e0a80117b21952 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
+++ b/Tools/Scripts/webkitpy/tool/commands/stepsequence.py
@@ -26,12 +26,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
-from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
-from webkitpy.tool.bot.queueengine import QueueEngine
 from webkitpy.common.system.deprecated_logging import log
+from webkitpy.common.system.executive import ScriptError
+from webkitpy.tool.bot.queueengine import QueueEngine
 
 
 class StepSequenceErrorHandler():

diff --git a/Tools/Scripts/webkitpy/tool/commands/upload.py b/Tools/Scripts/webkitpy/tool/commands/upload.py
index 6617b4fe89e0267555f5816050d3daa38114ad44..e455b188b4d9ffcc5ec049e2afbc53c931087976 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/upload.py
+++ b/Tools/Scripts/webkitpy/tool/commands/upload.py
@@ -34,17 +34,17 @@ import sys
 
 from optparse import make_option
 
-import webkitpy.tool.steps as steps
+from webkitpy.tool import steps
 
 from webkitpy.common.config.committers import CommitterList
 from webkitpy.common.net.bugzilla import parse_bug_id
+from webkitpy.common.system.deprecated_logging import error, log
 from webkitpy.common.system.user import User
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.commands.abstractsequencedcommand import AbstractSequencedCommand
-from webkitpy.tool.grammar import pluralize, join_with_separators
 from webkitpy.tool.comments import bug_comment_from_svn_revision
+from webkitpy.tool.grammar import pluralize, join_with_separators
 from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
-from webkitpy.common.system.deprecated_logging import error, log
 
 
 class CommitMessageForCurrentDiff(AbstractDeclarativeCommand):

diff --git a/Tools/Scripts/webkitpy/tool/main.py b/Tools/Scripts/webkitpy/tool/main.py
index 6b076158875fdf24bb43035c60a054b050c8026e..25cb9f92332b268711f939d099f8de8bff1b4561 100755 (executable)
--- a/Tools/Scripts/webkitpy/tool/main.py
+++ b/Tools/Scripts/webkitpy/tool/main.py
@@ -44,7 +44,7 @@ from webkitpy.common.net.statusserver import StatusServer
 from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
 from webkitpy.layout_tests import port
 from webkitpy.tool.multicommandtool import MultiCommandTool
-import webkitpy.tool.commands as commands
+from webkitpy.tool import commands
 
 
 class WebKitPatch(MultiCommandTool, Host):