Modified: trunk/Tools/CISupport/ews-build/steps.py (272379 => 272380)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-04 21:28:25 UTC (rev 272379)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-04 21:31:22 UTC (rev 272380)
@@ -1099,7 +1099,7 @@
descriptionDone = ['check-webkit-style']
flunkOnFailure = True
failedTestsFormatString = '%d style error%s'
- command = ['python', 'Tools/Scripts/check-webkit-style']
+ command = ['python3', 'Tools/Scripts/check-webkit-style']
def __init__(self, **kwargs):
super(CheckStyle, self).__init__(logEnviron=False, **kwargs)
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (272379 => 272380)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-04 21:28:25 UTC (rev 272379)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-04 21:31:22 UTC (rev 272380)
@@ -236,7 +236,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/check-webkit-style'],
+ command=['python3', 'Tools/Scripts/check-webkit-style'],
)
+ 0,
)
@@ -252,7 +252,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/check-webkit-style'],
+ command=['python3', 'Tools/Scripts/check-webkit-style'],
)
+ 2,
)
@@ -268,7 +268,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/check-webkit-style'],
+ command=['python3', 'Tools/Scripts/check-webkit-style'],
)
+ ExpectShell.log('stdio', stdout='''ERROR: Source/WebCore/layout/FloatingContext.cpp:36: Code inside a namespace should not be indented. [whitespace/indent] [4]
ERROR: Source/WebCore/layout/FormattingContext.h:94: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3]
@@ -291,7 +291,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/check-webkit-style'],
+ command=['python3', 'Tools/Scripts/check-webkit-style'],
)
+ ExpectShell.log('stdio', stdout='Total errors found: 0 in 6 files')
+ 0,
@@ -308,7 +308,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- command=['python', 'Tools/Scripts/check-webkit-style'],
+ command=['python3', 'Tools/Scripts/check-webkit-style'],
)
+ ExpectShell.log('stdio', stdout='Total errors found: 0 in 0 files')
+ 2,
Modified: trunk/Tools/ChangeLog (272379 => 272380)
--- trunk/Tools/ChangeLog 2021-02-04 21:28:25 UTC (rev 272379)
+++ trunk/Tools/ChangeLog 2021-02-04 21:31:22 UTC (rev 272380)
@@ -1,5 +1,23 @@
2021-02-04 Jonathan Bedard <jbed...@apple.com>
+ [Python-3] Change shebang in check-webkit-style
+ https://bugs.webkit.org/show_bug.cgi?id=221420
+ <rdar://problem/73990232>
+
+ Reviewed by Michael Catanzaro.
+
+ * CISupport/ews-build/steps.py:
+ (CheckStyle): Invoke check-webkit-style with python3.
+ * CISupport/ews-build/steps_unittest.py:
+ (TestCheckStyle.test_success_internal): Invoke check-webkit-style with python3.
+ (TestCheckStyle.test_failure_unknown_try_codebase): Ditto.
+ (TestCheckStyle.test_failures_with_style_issues): Ditto.
+ (test_failures_no_style_issues): Ditto.
+ (test_failures_no_changes): Ditto.
+ * Scripts/check-webkit-style: Change python shebang to Python 3.
+
+2021-02-04 Jonathan Bedard <jbed...@apple.com>
+
[Python-3] Change shebang in git-webkit
https://bugs.webkit.org/show_bug.cgi?id=221412
<rdar://problem/73983881>
Modified: trunk/Tools/Scripts/check-webkit-style (272379 => 272380)
--- trunk/Tools/Scripts/check-webkit-style 2021-02-04 21:28:25 UTC (rev 272379)
+++ trunk/Tools/Scripts/check-webkit-style 2021-02-04 21:31:22 UTC (rev 272380)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2011 Google Inc. All rights reserved.
# Copyright (C) 2010 Chris Jerdonek (chris.jerdo...@gmail.com)
