pyupgrade --py37-plus

mesonbuild/dependencies/hdf5.py

@@ -164,7 +164,7 @@ def hdf5_factory(env: 'Environment', for_machine: 'MachineChoice',
         if PCEXE:
             # some distros put hdf5-1.2.3.pc with version number in .pc filename.
             ret = subprocess.run([PCEXE, '--list-all'], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL,
-                                    universal_newlines=True)
+                                    text=True)
             if ret.returncode == 0:
                 for pkg in ret.stdout.split('\n'):
                     if pkg.startswith('hdf5'):

run_meson_command_tests.py

@@ -70,7 +70,7 @@ class CommandTests(unittest.TestCase):
         # between CI issue and test bug in that case. Set timeout and fail loud
         # instead.
         p = subprocess.run(command, stdout=subprocess.PIPE,
-                           env=os.environ.copy(), universal_newlines=True,
+                           env=os.environ.copy(), text=True,
                            cwd=workdir, timeout=60 * 5)
         print(p.stdout)
         if p.returncode != 0:

run_project_tests.py

@@ -926,8 +926,7 @@ def have_d_compiler() -> bool:
         # that exists but segfaults every time the compiler is run.
         # Don't know why. Don't know how to fix. Skip in this case.
         cp = subprocess.run(['dmd', '--version'],
-                            stdout=subprocess.PIPE,
+                            capture_output=True)
-                            stderr=subprocess.PIPE)
         if cp.stdout == b'':
             return False
         return True

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:

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

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,
+        p = subprocess.run(command, capture_output=True,
-                           universal_newlines=True, timeout=60)
+                           text=True, timeout=60)
         print('STDOUT:')
         print(p.stdout)
         print('STDERR:')