Changeset 107302 in webkit


Ignore:
Timestamp:
Feb 9, 2012 4:09:31 PM (12 years ago)
Author:
eric@webkit.org
Message:

Remove more uses of "os" from our webkitpy code
https://bugs.webkit.org/show_bug.cgi?id=78292

Reviewed by Adam Barth.

  • Scripts/webkitpy/common/checkout/checkout_mock.py:

(MockCheckout.init):
(MockCheckout.is_path_to_changelog):

  • Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
  • Scripts/webkitpy/common/system/filesystem_mock.py:

(MockFileSystem._split):

  • Scripts/webkitpy/common/system/zipfileset_unittest.py:
  • Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
  • Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
  • Scripts/webkitpy/layout_tests/port/webkit.py:
  • Scripts/webkitpy/tool/bot/queueengine.py:
  • Scripts/webkitpy/tool/bot/sheriff_unittest.py:
  • Scripts/webkitpy/tool/commands/download.py:
  • Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
  • Scripts/webkitpy/tool/commands/rebaselineserver.py:
  • Scripts/webkitpy/tool/commands/sheriffbot.py:
  • Scripts/webkitpy/tool/commands/sheriffbot_unittest.py:
  • Scripts/webkitpy/tool/commands/upload.py:

(CreateBug.prompt_for_bug_title_and_comment):

  • Scripts/webkitpy/tool/servers/reflectionhandler.py:
  • Scripts/webkitpy/tool/steps/attachtobug.py:

(AttachToBug.run):

  • Scripts/webkitpy/tool/steps/checkstyle.py:
  • Scripts/webkitpy/tool/steps/cleanworkingdirectory.py:
  • Scripts/webkitpy/tool/steps/commit_unittest.py:
  • Scripts/webkitpy/tool/steps/editchangelog.py:
  • Scripts/webkitpy/tool/steps/preparechangelog.py:
  • Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:

(PrepareChangeLogTest.test_ensure_bug_url):

  • Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:
  • Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
  • Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
  • Scripts/webkitpy/tool/steps/validatereviewer.py:
Location:
trunk/Tools
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r107297 r107302  
     12012-02-09  Eric Seidel  <eric@webkit.org>
     2
     3        Remove more uses of "os" from our webkitpy code
     4        https://bugs.webkit.org/show_bug.cgi?id=78292
     5
     6        Reviewed by Adam Barth.
     7
     8        * Scripts/webkitpy/common/checkout/checkout_mock.py:
     9        (MockCheckout.__init__):
     10        (MockCheckout.is_path_to_changelog):
     11        * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
     12        * Scripts/webkitpy/common/system/filesystem_mock.py:
     13        (MockFileSystem._split):
     14        * Scripts/webkitpy/common/system/zipfileset_unittest.py:
     15        * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
     16        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
     17        * Scripts/webkitpy/layout_tests/port/webkit.py:
     18        * Scripts/webkitpy/tool/bot/queueengine.py:
     19        * Scripts/webkitpy/tool/bot/sheriff_unittest.py:
     20        * Scripts/webkitpy/tool/commands/download.py:
     21        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
     22        * Scripts/webkitpy/tool/commands/rebaselineserver.py:
     23        * Scripts/webkitpy/tool/commands/sheriffbot.py:
     24        * Scripts/webkitpy/tool/commands/sheriffbot_unittest.py:
     25        * Scripts/webkitpy/tool/commands/upload.py:
     26        (CreateBug.prompt_for_bug_title_and_comment):
     27        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
     28        * Scripts/webkitpy/tool/steps/attachtobug.py:
     29        (AttachToBug.run):
     30        * Scripts/webkitpy/tool/steps/checkstyle.py:
     31        * Scripts/webkitpy/tool/steps/cleanworkingdirectory.py:
     32        * Scripts/webkitpy/tool/steps/commit_unittest.py:
     33        * Scripts/webkitpy/tool/steps/editchangelog.py:
     34        * Scripts/webkitpy/tool/steps/preparechangelog.py:
     35        * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
     36        (PrepareChangeLogTest.test_ensure_bug_url):
     37        * Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:
     38        * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
     39        * Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
     40        * Scripts/webkitpy/tool/steps/validatereviewer.py:
     41
    1422012-02-09  Eric Seidel  <eric@webkit.org>
    243
  • trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py

    r105945 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from .deps_mock import MockDEPS
    3230from .commitinfo import CommitInfo
     
    3533from webkitpy.common.config.committers import CommitterList
    3634from webkitpy.common.net.bugzilla.bugzilla_mock import _mock_reviewers
     35from webkitpy.common.system.filesystem_mock import MockFileSystem
    3736
    3837
     
    4342
    4443class MockCheckout(object):
     44    def __init__(self):
     45        # FIXME: It's unclear if a MockCheckout is very useful.  A normal Checkout
     46        # with a MockSCM/MockFileSystem/MockExecutive is probably better.
     47        self._filesystem = MockFileSystem()
    4548
    4649    # FIXME: This should move onto the Host object, and we should use a MockCommitterList for tests.
     
    6568
    6669    def is_path_to_changelog(self, path):
    67         # FIXME: This should self._filesystem.basename.
    68         return os.path.basename(path) == "ChangeLog"
     70        return self._filesystem.basename(path) == "ChangeLog"
    6971
    7072    def bug_id_for_revision(self, svn_revision):
  • trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py

    r105842 r107302  
    3232
    3333import mimetypes
    34 import os.path
    3534import re
    3635import StringIO
  • trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

    r107145 r107302  
    7272
    7373    def _split(self, path):
    74         return path.rsplit(self.sep, 1)
     74        # This is not quite a full implementation of os.path.split
     75        # http://docs.python.org/library/os.path.html#os.path.split
     76        if self.sep in path:
     77            return path.rsplit(self.sep, 1)
     78        return ('', path)
    7579
    7680    def abspath(self, path):
  • trunk/Tools/Scripts/webkitpy/common/system/zipfileset_unittest.py

    r77093 r107302  
    2222# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 import os
    2524import shutil
    2625import tempfile
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

    r101907 r107302  
    2929
    3030import logging
    31 import os
    3231
    3332from webkitpy.common.system.crashlogs import CrashLogs
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

    r107139 r107302  
    2929import json
    3030import logging
    31 import os
    3231import subprocess
    3332import sys
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

    r107284 r107302  
    3636import logging
    3737import operator
    38 import os
    3938import re
    4039import sys
  • trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py

    r106721 r107302  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 import os
    3130import sys
    32 import time
    3331import traceback
    3432
  • trunk/Tools/Scripts/webkitpy/tool/bot/sheriff_unittest.py

    r68746 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    3029import unittest
    3130
  • trunk/Tools/Scripts/webkitpy/tool/commands/download.py

    r106832 r107302  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 import os
    31 
    3230from webkitpy.tool import steps
    3331
  • trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

    r107297 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.thirdparty.mock import Mock
  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaselineserver.py

    r99233 r107302  
    3030results directory), provides comparisons of expected and actual results (both
    3131images and text) and allows one-click rebaselining of tests."""
    32 
    33 import os
    34 import os.path
    3532
    3633from webkitpy.common import system
  • trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot.py

    r107271 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.common.system.deprecated_logging import log
  • trunk/Tools/Scripts/webkitpy/tool/commands/sheriffbot_unittest.py

    r90636 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from webkitpy.tool.commands.queuestest import QueuesTest
    32 from webkitpy.tool.commands.sheriffbot import SheriffBot
    33 from webkitpy.tool.mocktool import *
    3430
    3531
  • trunk/Tools/Scripts/webkitpy/tool/commands/upload.py

    r106721 r107302  
    483483    def prompt_for_bug_title_and_comment(self):
    484484        bug_title = User.prompt("Bug title: ")
     485        # FIXME: User should provide a function for doing this multi-line prompt.
    485486        print "Bug comment (hit ^D on blank line to end):"
    486487        lines = sys.stdin.readlines()
  • trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py

    r107139 r107302  
    3535import json
    3636import mimetypes
    37 import os
    3837import os.path
    3938import shutil
     
    4342import wsgiref.handlers
    4443import BaseHTTPServer
     44
    4545
    4646class ReflectionHandler(BaseHTTPServer.BaseHTTPRequestHandler):
  • trunk/Tools/Scripts/webkitpy/tool/steps/attachtobug.py

    r80537 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from webkitpy.tool.steps.abstractstep import AbstractStep
    3230from webkitpy.tool.steps.options import Options
     
    4442        filepath = state["filepath"]
    4543        bug_id = state["bug_id"]
    46         description = self._options.description or filepath.split(os.sep)[-1]
     44        description = self._options.description or self._tool.filesystem.basename(filepath)
    4745        comment_text = self._options.comment
    4846
  • trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py

    r106721 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.common.system.executive import ScriptError
  • trunk/Tools/Scripts/webkitpy/tool/steps/cleanworkingdirectory.py

    r90978 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from webkitpy.tool.steps.abstractstep import AbstractStep
    3230from webkitpy.tool.steps.options import Options
  • trunk/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py

    r105213 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    3029import unittest
    3130
  • trunk/Tools/Scripts/webkitpy/tool/steps/editchangelog.py

    r91210 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from webkitpy.tool.steps.abstractstep import AbstractStep
    3230
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py

    r101834 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.common.checkout.changelog import ChangeLog
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py

    r107293 r107302  
    4040class PrepareChangeLogTest(changelog_unittest.ChangeLogTest):
    4141    def test_ensure_bug_url(self):
     42        # FIXME: This should use a MockFileSystem instead of a real FileSystem.
    4243        capture = OutputCapture()
    4344        step = PrepareChangeLog(MockTool(), MockOptions())
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py

    r90537 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 
    3129from webkitpy.common.checkout.changelog import ChangeLog
    3230from webkitpy.tool.steps.abstractstep import AbstractStep
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py

    r91210 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.common.checkout.changelog import ChangeLog
  • trunk/Tools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py

    r101834 r107302  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 import os
    3028
    3129from webkitpy.common.checkout.changelog import ChangeLog
  • trunk/Tools/Scripts/webkitpy/tool/steps/validatereviewer.py

    r100407 r107302  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import os
    30 import re
    31 
    3229from webkitpy.common.checkout.changelog import ChangeLog
    3330from webkitpy.tool.steps.abstractstep import AbstractStep
Note: See TracChangeset for help on using the changeset viewer.