diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-08-15 11:34:11 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-10 18:36:56 -0500 |
| commit | 751f84405eb1138b7a9b75bfb51be161a62057e4 (patch) | |
| tree | 3f7f0ee76eddabc80be6d166406dd14c7bca0258 /unittests | |
| parent | ad525dcce45487def9d3950bed159f1c158e3581 (diff) | |
| download | meson-751f84405eb1138b7a9b75bfb51be161a62057e4.zip meson-751f84405eb1138b7a9b75bfb51be161a62057e4.tar.gz meson-751f84405eb1138b7a9b75bfb51be161a62057e4.tar.bz2 | |
pyupgrade --py37-plus
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/baseplatformtests.py | 2 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 2 | ||||
| -rw-r--r-- | unittests/rewritetests.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index bd2f902..2f8064e 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -160,7 +160,7 @@ class BasePlatformTests(TestCase): p = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env, encoding='utf-8', - universal_newlines=True, cwd=workdir, timeout=60 * 5) + text=True, cwd=workdir, timeout=60 * 5) print(p.stdout) if p.returncode != 0: if 'MESON_SKIP_TEST' in p.stdout: diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 594e9f0..ade489d 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1717,7 +1717,7 @@ class LinuxlikeTests(BasePlatformTests): p = subprocess.run([ar, 't', outlib], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, - universal_newlines=True, timeout=1) + text=True, timeout=1) obj_files = p.stdout.strip().split('\n') self.assertEqual(len(obj_files), 1) self.assertTrue(obj_files[0].endswith('-prelink.o')) diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index 1e6a398..1d90f2a 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py @@ -32,8 +32,8 @@ class RewriterTests(BasePlatformTests): if isinstance(args, str): args = [args] command = self.rewrite_command + ['--verbose', '--skip', '--sourcedir', directory] + args - p = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - universal_newlines=True, timeout=60) + p = subprocess.run(command, capture_output=True, + text=True, timeout=60) print('STDOUT:') print(p.stdout) print('STDERR:') |