diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:02:31 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:11:26 -0500 |
| commit | 4340bf34faca7eed8076ba4c388fbe15355f2183 (patch) | |
| tree | 6082548a6cb79091d1059a73e7b3b9f59657f6d9 /mesonbuild/compilers/d.py | |
| parent | 76df995ba69ef5d790462856b3edbd42b28b906a (diff) | |
| download | meson-4340bf34faca7eed8076ba4c388fbe15355f2183.zip meson-4340bf34faca7eed8076ba4c388fbe15355f2183.tar.gz meson-4340bf34faca7eed8076ba4c388fbe15355f2183.tar.bz2 | |
various python neatness cleanups
All changes were created by running
"pyupgrade --py3-only --keep-percent-format"
and committing the results. I have not touched string formatting for
now.
- use set literals
- simplify .format() parameter naming
- remove __future__
- remove default "r" mode for open()
- use OSError rather than compatibility aliases
- remove stray parentheses in function(generator) scopes
Diffstat (limited to 'mesonbuild/compilers/d.py')
| -rw-r--r-- | mesonbuild/compilers/d.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index ef261fd..b16aca8 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -183,10 +183,10 @@ class DmdLikeCompilerMixin(CompilerMixinBase): if int(d) > debug_level: debug_level = int(d) else: - res.append('{0}={1}'.format(debug_arg, d)) + res.append('{}={}'.format(debug_arg, d)) if debug_level >= 0: - res.append('{0}={1}'.format(debug_arg, debug_level)) + res.append('{}={}'.format(debug_arg, debug_level)) if 'versions' in kwargs: version_level = -1 @@ -207,10 +207,10 @@ class DmdLikeCompilerMixin(CompilerMixinBase): if int(v) > version_level: version_level = int(v) else: - res.append('{0}={1}'.format(version_arg, v)) + res.append('{}={}'.format(version_arg, v)) if version_level >= 0: - res.append('{0}={1}'.format(version_arg, version_level)) + res.append('{}={}'.format(version_arg, version_level)) if 'import_dirs' in kwargs: import_dirs = kwargs.pop('import_dirs') @@ -230,8 +230,8 @@ class DmdLikeCompilerMixin(CompilerMixinBase): else: expdir = basedir srctreedir = os.path.join(build_to_src, expdir) - res.append('{0}{1}'.format(import_dir_arg, srctreedir)) - res.append('{0}{1}'.format(import_dir_arg, bldtreedir)) + res.append('{}{}'.format(import_dir_arg, srctreedir)) + res.append('{}{}'.format(import_dir_arg, bldtreedir)) if kwargs: raise EnvironmentException('Unknown D compiler feature(s) selected: %s' % ', '.join(kwargs.keys())) @@ -560,10 +560,10 @@ class DCompiler(Compiler): if int(d) > debug_level: debug_level = int(d) else: - res.append('{0}={1}'.format(debug_arg, d)) + res.append('{}={}'.format(debug_arg, d)) if debug_level >= 0: - res.append('{0}={1}'.format(debug_arg, debug_level)) + res.append('{}={}'.format(debug_arg, debug_level)) if 'versions' in kwargs: version_level = -1 @@ -584,10 +584,10 @@ class DCompiler(Compiler): if int(v) > version_level: version_level = int(v) else: - res.append('{0}={1}'.format(version_arg, v)) + res.append('{}={}'.format(version_arg, v)) if version_level >= 0: - res.append('{0}={1}'.format(version_arg, version_level)) + res.append('{}={}'.format(version_arg, version_level)) if 'import_dirs' in kwargs: import_dirs = kwargs.pop('import_dirs') @@ -607,8 +607,8 @@ class DCompiler(Compiler): else: expdir = basedir srctreedir = os.path.join(build_to_src, expdir) - res.append('{0}{1}'.format(import_dir_arg, srctreedir)) - res.append('{0}{1}'.format(import_dir_arg, bldtreedir)) + res.append('{}{}'.format(import_dir_arg, srctreedir)) + res.append('{}{}'.format(import_dir_arg, bldtreedir)) if kwargs: raise EnvironmentException('Unknown D compiler feature(s) selected: %s' % ', '.join(kwargs.keys())) |