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/dependencies/hdf5.py | |
| parent | 4340bf34faca7eed8076ba4c388fbe15355f2183 (diff) | |
| download | meson-6a0fabc6472f49621260de215f128a31ae70219b.zip meson-6a0fabc6472f49621260de215f128a31ae70219b.tar.gz meson-6a0fabc6472f49621260de215f128a31ae70219b.tar.bz2 | |
mass rewrite of string formatting to use f-strings everywhere
performed by running "pyupgrade --py36-plus" and committing the results
Diffstat (limited to 'mesonbuild/dependencies/hdf5.py')
| -rw-r--r-- | mesonbuild/dependencies/hdf5.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/hdf5.py b/mesonbuild/dependencies/hdf5.py index 7c35a02..59c7382 100644 --- a/mesonbuild/dependencies/hdf5.py +++ b/mesonbuild/dependencies/hdf5.py @@ -41,7 +41,7 @@ class HDF5PkgConfigDependency(PkgConfigDependency): def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any], language: T.Optional[str] = None) -> None: language = language or 'c' if language not in {'c', 'cpp', 'fortran'}: - raise DependencyException('Language {} is not supported with HDF5.'.format(language)) + raise DependencyException(f'Language {language} is not supported with HDF5.') super().__init__(name, environment, kwargs, language) if not self.is_found: @@ -92,7 +92,7 @@ class HDF5ConfigToolDependency(ConfigToolDependency): def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any], language: T.Optional[str] = None) -> None: language = language or 'c' if language not in {'c', 'cpp', 'fortran'}: - raise DependencyException('Language {} is not supported with HDF5.'.format(language)) + raise DependencyException(f'Language {language} is not supported with HDF5.') if language == 'c': cenv = 'CC' @@ -117,12 +117,12 @@ class HDF5ConfigToolDependency(ConfigToolDependency): # linkers. compiler = environment.coredata.compilers[for_machine][language] try: - os.environ['HDF5_{}'.format(cenv)] = join_args(compiler.get_exelist()) - os.environ['HDF5_{}LINKER'.format(cenv)] = join_args(compiler.get_linker_exelist()) + os.environ[f'HDF5_{cenv}'] = join_args(compiler.get_exelist()) + os.environ[f'HDF5_{cenv}LINKER'] = join_args(compiler.get_linker_exelist()) super().__init__(name, environment, nkwargs, language) finally: - del os.environ['HDF5_{}'.format(cenv)] - del os.environ['HDF5_{}LINKER'.format(cenv)] + del os.environ[f'HDF5_{cenv}'] + del os.environ[f'HDF5_{cenv}LINKER'] if not self.is_found: return |