diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 11:06:16 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 11:06:16 -0500 |
| commit | fd572f32d86ff3c1e75c9c5c1efdec2f73eea284 (patch) | |
| tree | 6e59e786b4b7d3fcbfcef52066f30a3dd61b5333 | |
| parent | 11cfc258fc2cebe6360322f3338741e1d6694525 (diff) | |
| download | meson-fd572f32d86ff3c1e75c9c5c1efdec2f73eea284.zip meson-fd572f32d86ff3c1e75c9c5c1efdec2f73eea284.tar.gz meson-fd572f32d86ff3c1e75c9c5c1efdec2f73eea284.tar.bz2 | |
Popen_safe: Fix stdout/stderr annotation
| -rw-r--r-- | mesonbuild/mesonlib/universal.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index dfcec8e..4b913a8 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1305,8 +1305,8 @@ def partition(pred: T.Callable[[_T], object], iterable: T.Iterator[_T]) -> T.Tup def Popen_safe(args: T.List[str], write: T.Optional[str] = None, - stdout: T.Union[T.BinaryIO, int] = subprocess.PIPE, - stderr: T.Union[T.BinaryIO, int] = subprocess.PIPE, + stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, + stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, **kwargs: T.Any) -> T.Tuple[subprocess.Popen, str, str]: import locale encoding = locale.getpreferredencoding() @@ -1328,8 +1328,8 @@ def Popen_safe(args: T.List[str], write: T.Optional[str] = None, def Popen_safe_legacy(args: T.List[str], write: T.Optional[str] = None, - stdout: T.Union[T.BinaryIO, int] = subprocess.PIPE, - stderr: T.Union[T.BinaryIO, int] = subprocess.PIPE, + stdout: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, + stderr: T.Union[T.TextIO, T.BinaryIO, int] = subprocess.PIPE, **kwargs: T.Any) -> T.Tuple[subprocess.Popen, str, str]: p = subprocess.Popen(args, universal_newlines=False, close_fds=False, stdout=stdout, stderr=stderr, **kwargs) |