Title: [244310] trunk/Tools
- Revision
- 244310
- Author
- [email protected]
- Date
- 2019-04-15 17:00:48 -0700 (Mon, 15 Apr 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (244309 => 244310)
--- trunk/Tools/ChangeLog 2019-04-15 23:53:23 UTC (rev 244309)
+++ trunk/Tools/ChangeLog 2019-04-16 00:00:48 UTC (rev 244310)
@@ -1,3 +1,17 @@
+2019-04-15 Dean Johnson <[email protected]>
+
+ 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):
+
2019-04-15 Alex Christensen <[email protected]>
Add a DiagnosticLogging method taking an arbitrary dictionary of values.
Modified: trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py (244309 => 244310)
--- trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2019-04-15 23:53:23 UTC (rev 244309)
+++ trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2019-04-16 00:00:48 UTC (rev 244310)
@@ -47,7 +47,15 @@
from glob import glob
import urlparse
+
_log = logging.getLogger(__name__)
+if not _log.handlers: # No parent loggers setup.
+ handler = logging.StreamHandler()
+ handler.setLevel(logging.INFO)
+ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+ handler.setFormatter(formatter)
+ _log.addHandler(handler)
+
_MIRROR_REGEXS = re.compile('.*sourceforge.*'), re.compile('.*pypi.*')
_PYPI_ENV_VAR = 'PYPI_MIRRORS'
_SOURCEFORGE_ENV_VAR = 'SOURCEFORGE_MIRRORS'
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (244309 => 244310)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-04-15 23:53:23 UTC (rev 244309)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-04-16 00:00:48 UTC (rev 244310)
@@ -62,7 +62,6 @@
from webkitpy.layout_tests.servers import apache_http_server, http_server, http_server_base
from webkitpy.layout_tests.servers import web_platform_test_server
from webkitpy.layout_tests.servers import websocket_server
-from webkitpy.results.upload import Upload
_log = logging.getLogger(__name__)
@@ -1638,6 +1637,8 @@
pass
def configuration_for_upload(self, host=None):
+ from webkitpy.results.upload import Upload
+
configuration = self.test_configuration()
host = self.host or host
@@ -1652,12 +1653,13 @@
@memoized
def commits_for_upload(self):
+ from webkitpy.results.upload import Upload
+
self.host.initialize_scm()
+ repos = {}
if port_config.apple_additions() and getattr(port_config.apple_additions(), 'repos', False):
repos = port_config.apple_additions().repos()
- else:
- repos = {}
up = os.path.dirname
repos['webkit'] = up(up(up(up(up(os.path.abspath(__file__))))))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
