diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:16:11 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:16:11 -0500 |
| commit | 6a0fabc6472f49621260de215f128a31ae70219b (patch) | |
| tree | 6a67908358a2c5e5baa215fe0201dfe213dd8a01 /mesonbuild/cmake/executor.py | |
| parent | 4340bf34faca7eed8076ba4c388fbe15355f2183 (diff) | |
| download | meson-6a0fabc6472f49621260de215f128a31ae70219b.tar.gz | |
mass rewrite of string formatting to use f-strings everywhere
performed by running "pyupgrade --py36-plus" and committing the results
Diffstat (limited to 'mesonbuild/cmake/executor.py')
| -rw-r--r-- | mesonbuild/cmake/executor.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py index e4b85de81..860d410c3 100644 --- a/mesonbuild/cmake/executor.py +++ b/mesonbuild/cmake/executor.py @@ -87,7 +87,7 @@ class CMakeExecutor: continue if not silent: mlog.log('Found CMake:', mlog.bold(potential_cmakebin.get_path()), - '({})'.format(version_if_ok)) + f'({version_if_ok})') CMakeExecutor.class_cmakebin[self.for_machine] = potential_cmakebin CMakeExecutor.class_cmakevers[self.for_machine] = version_if_ok break @@ -104,7 +104,7 @@ class CMakeExecutor: def check_cmake(self, cmakebin: 'ExternalProgram') -> T.Optional[str]: if not cmakebin.found(): - mlog.log('Did not find CMake {!r}'.format(cmakebin.name)) + mlog.log(f'Did not find CMake {cmakebin.name!r}') return None try: p, out = Popen_safe(cmakebin.get_command() + ['--version'])[0:2] @@ -202,9 +202,9 @@ class CMakeExecutor: return rc, out, err def _call_impl(self, args: T.List[str], build_dir: Path, env: T.Optional[T.Dict[str, str]]) -> TYPE_result: - mlog.debug('Calling CMake ({}) in {} with:'.format(self.cmakebin.get_command(), build_dir)) + mlog.debug(f'Calling CMake ({self.cmakebin.get_command()}) in {build_dir} with:') for i in args: - mlog.debug(' - "{}"'.format(i)) + mlog.debug(f' - "{i}"') if not self.print_cmout: return self._call_quiet(args, build_dir, env) else: |