Changeset 244310 in webkit


Ignore:
Timestamp:
Apr 15, 2019 5:00:48 PM (5 years ago)
Author:
dean_johnson@apple.com
Message:

Using Tools/Scripts/clean-webkit should not install requests
https://bugs.webkit.org/show_bug.cgi?id=196940

Reviewed by Lucas Forschler.

  • Scripts/webkitpy/common/system/autoinstall.py: Drive-by fix for no logging handlers

existing, depending on the path autoinstalled is run through.

  • Scripts/webkitpy/port/base.py: Import webkitpy.results.upload.Upload only where it's

needed.
(Port.configuration_for_upload):
(Port.commits_for_upload):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r244307 r244310  
     12019-04-15  Dean Johnson  <dean_johnson@apple.com>
     2
     3        Using Tools/Scripts/clean-webkit should not install requests
     4        https://bugs.webkit.org/show_bug.cgi?id=196940
     5
     6        Reviewed by Lucas Forschler.
     7
     8        * Scripts/webkitpy/common/system/autoinstall.py: Drive-by fix for no logging handlers
     9        existing, depending on the path autoinstalled is run through.
     10        * Scripts/webkitpy/port/base.py: Import webkitpy.results.upload.Upload only where it's
     11        needed.
     12        (Port.configuration_for_upload):
     13        (Port.commits_for_upload):
     14
    1152019-04-15  Alex Christensen  <achristensen@webkit.org>
    216
  • trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py

    r225733 r244310  
    4848import urlparse
    4949
     50
    5051_log = logging.getLogger(__name__)
     52if not _log.handlers:  # No parent loggers setup.
     53    handler = logging.StreamHandler()
     54    handler.setLevel(logging.INFO)
     55    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
     56    handler.setFormatter(formatter)
     57    _log.addHandler(handler)
     58
    5159_MIRROR_REGEXS = re.compile('.*sourceforge.*'), re.compile('.*pypi.*')
    5260_PYPI_ENV_VAR = 'PYPI_MIRRORS'
  • trunk/Tools/Scripts/webkitpy/port/base.py

    r243732 r244310  
    6363from webkitpy.layout_tests.servers import web_platform_test_server
    6464from webkitpy.layout_tests.servers import websocket_server
    65 from webkitpy.results.upload import Upload
    6665
    6766_log = logging.getLogger(__name__)
     
    16391638
    16401639    def configuration_for_upload(self, host=None):
     1640        from webkitpy.results.upload import Upload
     1641
    16411642        configuration = self.test_configuration()
    16421643        host = self.host or host
     
    16531654    @memoized
    16541655    def commits_for_upload(self):
     1656        from webkitpy.results.upload import Upload
     1657
    16551658        self.host.initialize_scm()
    16561659
     1660        repos = {}
    16571661        if port_config.apple_additions() and getattr(port_config.apple_additions(), 'repos', False):
    16581662            repos = port_config.apple_additions().repos()
    1659         else:
    1660             repos = {}
    16611663
    16621664        up = os.path.dirname
Note: See TracChangeset for help on using the changeset viewer.