mass rewrite of string formatting to use f-strings everywhere

performed by running "pyupgrade --py36-plus" and committing the results

Author: eli-schwartz

docs/genrelnotes.py

@@ -50,7 +50,7 @@ def generate(from_version, to_version):
     '''
        Generate notes for Meson build next release.
     '''
-    ofilename = 'Release-notes-for-{}.md'.format(to_version)
+    ofilename = f'Release-notes-for-{to_version}.md'
     with open(ofilename, 'w') as ofile:
         ofile.write(RELNOTE_TEMPLATE.format(to_version, to_version))
         for snippetfile in glob('snippets/*.md'):

ghwt.py

@@ -43,7 +43,7 @@ def list_projects():
 def unpack(sproj, branch):
     tmpdir = os.path.join(spdir, sproj + '_ghwt')
     shutil.rmtree(tmpdir, ignore_errors=True)
-    subprocess.check_call(['git', 'clone', '-b', branch, 'https://github.com/mesonbuild/{}.git'.format(sproj), tmpdir])
+    subprocess.check_call(['git', 'clone', '-b', branch, f'https://github.com/mesonbuild/{sproj}.git', tmpdir])
     usfile = os.path.join(tmpdir, 'upstream.wrap')
     assert(os.path.isfile(usfile))
     config = configparser.ConfigParser(interpolation=None)
@@ -52,7 +52,7 @@ def unpack(sproj, branch):
     if 'directory' in config['wrap-file']:
         outdir = os.path.join(spdir, config['wrap-file']['directory'])
     if os.path.isdir(outdir):
-        print('Subproject is already there. To update, nuke the {} dir and reinstall.'.format(outdir))
+        print(f'Subproject is already there. To update, nuke the {outdir} dir and reinstall.')
         shutil.rmtree(tmpdir)
         return 1
     us_url = config['wrap-file']['source_url']
@@ -85,7 +85,7 @@ def install(sproj, requested_branch=None):
     if not os.path.isdir(spdir):
         print('Run this in your source root and make sure there is a subprojects directory in it.')
         return 1
-    blist = gh_get('https://api.github.com/repos/mesonbuild/{}/branches'.format(sproj))
+    blist = gh_get(f'https://api.github.com/repos/mesonbuild/{sproj}/branches')
     blist = [b['name'] for b in blist]
     blist = [b for b in blist if b != 'master']
     blist.sort()

mesonbuild/arglist.py

@@ -290,7 +290,7 @@ def __iadd__(self, args: T.Iterable[str]) -> 'CompilerArgs':
         '''
         tmp_pre = collections.deque()  # type: T.Deque[str]
         if not isinstance(args, collections.abc.Iterable):
-            raise TypeError('can only concatenate Iterable[str] (not "{}") to CompilerArgs'.format(args))
+            raise TypeError(f'can only concatenate Iterable[str] (not "{args}") to CompilerArgs')
         for arg in args:
             # If the argument can be de-duped, do it either by removing the
             # previous occurrence of it and adding a new one, or not adding the
@@ -331,4 +331,4 @@ def extend(self, args: T.Iterable[str]) -> None:
 
     def __repr__(self) -> str:
         self.flush_pre_post()
-        return 'CompilerArgs({!r}, {!r})'.format(self.compiler, self._container)
+        return f'CompilerArgs({self.compiler!r}, {self._container!r})'

mesonbuild/ast/interpreter.py

@@ -141,7 +141,7 @@ def load_root_meson_file(self) -> None:
     def func_subdir(self, node: BaseNode, args: T.List[TYPE_nvar], kwargs: T.Dict[str, TYPE_nvar]) -> None:
         args = self.flatten_args(args)
         if len(args) != 1 or not isinstance(args[0], str):
-            sys.stderr.write('Unable to evaluate subdir({}) in AstInterpreter --> Skipping\n'.format(args))
+            sys.stderr.write(f'Unable to evaluate subdir({args}) in AstInterpreter --> Skipping\n')
             return
 
         prev_subdir = self.subdir
@@ -156,7 +156,7 @@ def func_subdir(self, node: BaseNode, args: T.List[TYPE_nvar], kwargs: T.Dict[st
         self.visited_subdirs[symlinkless_dir] = True
 
         if not os.path.isfile(absname):
-            sys.stderr.write('Unable to find build file {} --> Skipping\n'.format(buildfilename))
+            sys.stderr.write(f'Unable to find build file {buildfilename} --> Skipping\n')
             return
         with open(absname, encoding='utf8') as f:
             code = f.read()

mesonbuild/backend/backends.py

@@ -65,7 +65,7 @@ def from_str(cls, string: str) -> 'TestProtocol':
             return cls.GTEST
         elif string == 'rust':
             return cls.RUST
-        raise MesonException('unknown test format {}'.format(string))
+        raise MesonException(f'unknown test format {string}')
 
     def __str__(self) -> str:
         cls = type(self)
@@ -282,14 +282,14 @@ def get_target_filename_for_linking(self, target):
             return os.path.join(self.get_target_dir(target), target.get_filename())
         elif isinstance(target, (build.CustomTarget, build.CustomTargetIndex)):
             if not target.is_linkable_target():
-                raise MesonException('Tried to link against custom target "{}", which is not linkable.'.format(target.name))
+                raise MesonException(f'Tried to link against custom target "{target.name}", which is not linkable.')
             return os.path.join(self.get_target_dir(target), target.get_filename())
         elif isinstance(target, build.Executable):
             if target.import_filename:
                 return os.path.join(self.get_target_dir(target), target.get_import_filename())
             else:
                 return None
-        raise AssertionError('BUG: Tried to link to {!r} which is not linkable'.format(target))
+        raise AssertionError(f'BUG: Tried to link to {target!r} which is not linkable')
 
     @lru_cache(maxsize=None)
     def get_target_dir(self, target):
@@ -335,7 +335,7 @@ def get_target_generated_dir(self, target, gensrc, src):
     def get_unity_source_file(self, target, suffix, number):
         # There is a potential conflict here, but it is unlikely that
         # anyone both enables unity builds and has a file called foo-unity.cpp.
-        osrc = '{}-unity{}.{}'.format(target.name, number, suffix)
+        osrc = f'{target.name}-unity{number}.{suffix}'
         return mesonlib.File.from_built_file(self.get_target_private_dir(target), osrc)
 
     def generate_unity_files(self, target, unity_src):
@@ -368,7 +368,7 @@ def init_language_file(suffix, unity_file_number):
                     ofile = init_language_file(comp.get_default_suffix(), unity_file_number)
                     unity_file_number += 1
                     files_in_current = 0
-                ofile.write('#include<{}>\n'.format(src))
+                ofile.write(f'#include<{src}>\n')
                 files_in_current += 1
             if ofile:
                 ofile.close()
@@ -505,7 +505,7 @@ def as_meson_exe_cmdline(self, tname, exe, cmd_args, workdir=None,
         data = bytes(str(es.env) + str(es.cmd_args) + str(es.workdir) + str(capture),
                      encoding='utf-8')
         digest = hashlib.sha1(data).hexdigest()
-        scratch_file = 'meson_exe_{}_{}.dat'.format(basename, digest)
+        scratch_file = f'meson_exe_{basename}_{digest}.dat'
         exe_data = os.path.join(self.environment.get_scratch_dir(), scratch_file)
         with open(exe_data, 'wb') as f:
             pickle.dump(es, f)
@@ -575,7 +575,7 @@ def get_external_rpath_dirs(self, target):
                 for dir in symbols_match.group(1).split(':'):
                     # Prevent usage of --just-symbols to specify rpath
                     if Path(dir).is_dir():
-                        raise MesonException('Invalid arg for --just-symbols, {} is a directory.'.format(dir))
+                        raise MesonException(f'Invalid arg for --just-symbols, {dir} is a directory.')
         return dirs
 
     def rpaths_for_bundled_shared_libraries(self, target, exclude_system=True):
@@ -601,7 +601,7 @@ def rpaths_for_bundled_shared_libraries(self, target, exclude_system=True):
                 continue
             if libdir.startswith(self.environment.get_source_dir()):
                 rel_to_src = libdir[len(self.environment.get_source_dir()) + 1:]
-                assert not os.path.isabs(rel_to_src), 'rel_to_src: {} is absolute'.format(rel_to_src)
+                assert not os.path.isabs(rel_to_src), f'rel_to_src: {rel_to_src} is absolute'
                 paths.append(os.path.join(self.build_to_src, rel_to_src))
             else:
                 paths.append(libdir)
@@ -717,7 +717,7 @@ def get_pch_include_args(self, compiler, target):
     def create_msvc_pch_implementation(self, target, lang, pch_header):
         # We have to include the language in the file name, otherwise
         # pch.c and pch.cpp will both end up as pch.obj in VS backends.
-        impl_name = 'meson_pch-{}.{}'.format(lang, lang)
+        impl_name = f'meson_pch-{lang}.{lang}'
         pch_rel_to_build = os.path.join(self.get_target_private_dir(target), impl_name)
         # Make sure to prepend the build dir, since the working directory is
         # not defined. Otherwise, we might create the file in the wrong path.
@@ -833,7 +833,7 @@ def build_target_link_arguments(self, compiler, deps):
         args = []
         for d in deps:
             if not (d.is_linkable_target()):
-                raise RuntimeError('Tried to link with a non-library target "{}".'.format(d.get_basename()))
+                raise RuntimeError(f'Tried to link with a non-library target "{d.get_basename()}".')
             arg = self.get_target_filename_for_linking(d)
             if not arg:
                 continue
@@ -1011,7 +1011,7 @@ def check_clock_skew(self, file_list):
             # to the future by a minuscule amount, less than
             # 0.001 seconds. I don't know why.
             if delta > 0.001:
-                raise MesonException('Clock skew detected. File {} has a time stamp {:.4f}s in the future.'.format(absf, delta))
+                raise MesonException(f'Clock skew detected. File {absf} has a time stamp {delta:.4f}s in the future.')
 
     def build_target_to_cmd_array(self, bt):
         if isinstance(bt, build.BuildTarget):
@@ -1036,7 +1036,7 @@ def replace_outputs(self, args, private_dir, output_list):
             m = regex.search(arg)
             while m is not None:
                 index = int(m.group(1))
-                src = '@OUTPUT{}@'.format(index)
+                src = f'@OUTPUT{index}@'
                 arg = arg.replace(src, os.path.join(private_dir, output_list[index]))
                 m = regex.search(arg)
             newargs.append(arg)
@@ -1239,7 +1239,7 @@ def run_postconf_scripts(self) -> None:
 
         for s in self.build.postconf_scripts:
             name = ' '.join(s.cmd_args)
-            mlog.log('Running postconf script {!r}'.format(name))
+            mlog.log(f'Running postconf script {name!r}')
             run_exe(s, env)
 
     def create_install_data(self) -> InstallData: