Changeset 272397 in webkit

Timestamp:

Feb 4, 2021 4:27:25 PM (3 years ago)

Author:

Jonathan Bedard

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()

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-02-04  Jonathan Bedard  <jbedard@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  <jbedard@apple.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/subprocess_utils.py

@@ -35 +35 @@
     def run(*popenargs, **kwargs):
         timeout = kwargs.pop('timeout', None)
+        capture_output = kwargs.pop('capture_output', False)
 
         with Timeout.DisableAlarm():
@@ -43 +44 @@
             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)