Title: [272397] trunk/Tools
- Revision
- 272397
- Author
- jbed...@apple.com
- Date
- 2021-02-04 16:27:25 -0800 (Thu, 04 Feb 2021)
Log Message
[Python-3] Change shebang in git-webkit (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=221412
<rdar://problem/73983881>
Unreviewed follow-up fix.
* Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py:
(run): Python 3.6 does not support capture_output in subprocess.run()
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (272396 => 272397)
--- trunk/Tools/ChangeLog 2021-02-05 00:17:06 UTC (rev 272396)
+++ trunk/Tools/ChangeLog 2021-02-05 00:27:25 UTC (rev 272397)
@@ -1,5 +1,16 @@
2021-02-04 Jonathan Bedard <jbed...@apple.com>
+ [Python-3] Change shebang in git-webkit (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=221412
+ <rdar://problem/73983881>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py:
+ (run): Python 3.6 does not support capture_output in subprocess.run()
+
+2021-02-04 Jonathan Bedard <jbed...@apple.com>
+
[Python-3] Change shebang in test-webkitpy (Part-1)
https://bugs.webkit.org/show_bug.cgi?id=221415
<rdar://problem/73986503>
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py (272396 => 272397)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py 2021-02-05 00:17:06 UTC (rev 272396)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py 2021-02-05 00:27:25 UTC (rev 272397)
@@ -34,6 +34,7 @@
# Allows native integration with the Timeout context
def run(*popenargs, **kwargs):
timeout = kwargs.pop('timeout', None)
+ capture_output = kwargs.pop('capture_output', False)
with Timeout.DisableAlarm():
current_time = time.time()
@@ -42,6 +43,11 @@
if difference:
timeout = min(timeout or sys.maxsize, int(math.ceil(difference)))
+ if capture_output:
+ if ('stdout' in kwargs) or ('stderr' in kwargs):
+ raise ValueError('stdout and stderr arguments may not be used with capture_output.')
+ kwargs['stdout'] = subprocess.PIPE
+ kwargs['stderr'] = subprocess.PIPE
return subprocess.run(*popenargs, timeout=timeout, **kwargs)
else:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
