aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreterbase/interpreterbase.py
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-10-28 23:01:31 -0400
committerEli Schwartz <eschwartz@archlinux.org>2021-11-01 20:26:18 -0400
commit038b31e72bc02f0a9bdc6d8613992a5c344e8650 (patch)
treef24c7216b2b2934b1d1c7a87cc6727d5a193bcf0 /mesonbuild/interpreterbase/interpreterbase.py
parentbae0fdf64ac697b264bdb5eb93dcb160b3e7f6b2 (diff)
downloadmeson-038b31e72bc02f0a9bdc6d8613992a5c344e8650.zip
meson-038b31e72bc02f0a9bdc6d8613992a5c344e8650.tar.gz
meson-038b31e72bc02f0a9bdc6d8613992a5c344e8650.tar.bz2
various manual conversion of percent-formatted strings to f-strings
Diffstat (limited to 'mesonbuild/interpreterbase/interpreterbase.py')
-rw-r--r--mesonbuild/interpreterbase/interpreterbase.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py
index 326204d..d6fe8ed 100644
--- a/mesonbuild/interpreterbase/interpreterbase.py
+++ b/mesonbuild/interpreterbase/interpreterbase.py
@@ -98,7 +98,7 @@ class InterpreterBase:
def load_root_meson_file(self) -> None:
mesonfile = os.path.join(self.source_root, self.subdir, environment.build_filename)
if not os.path.isfile(mesonfile):
- raise InvalidArguments('Missing Meson file in %s' % mesonfile)
+ raise InvalidArguments(f'Missing Meson file in {mesonfile}')
with open(mesonfile, encoding='utf-8') as mf:
code = mf.read()
if code.isspace():
@@ -471,7 +471,7 @@ class InterpreterBase:
if is_disabled(args, kwargs):
return Disabler()
if not isinstance(obj, InterpreterObject):
- raise InvalidArguments('Variable "%s" is not callable.' % object_name)
+ raise InvalidArguments(f'Variable "{object_name}" is not callable.')
# TODO: InterpreterBase **really** shouldn't be in charge of checking this
if method_name == 'extract_objects':
if isinstance(obj, ObjectHolder):
@@ -507,7 +507,7 @@ class InterpreterBase:
return [_unholder(x) for x in args], {k: _unholder(v) for k, v in kwargs.items()}
def unknown_function_called(self, func_name: str) -> None:
- raise InvalidCode('Unknown function "%s".' % func_name)
+ raise InvalidCode(f'Unknown function "{func_name}".')
def reduce_arguments(
self,
@@ -584,7 +584,7 @@ class InterpreterBase:
if re.match('[_a-zA-Z][_0-9a-zA-Z]*$', varname) is None:
raise InvalidCode('Invalid variable name: ' + varname)
if varname in self.builtin:
- raise InvalidCode('Tried to overwrite internal variable "%s"' % varname)
+ raise InvalidCode(f'Tried to overwrite internal variable "{varname}"')
self.variables[varname] = variable
def get_variable(self, varname: str) -> InterpreterObject:
@@ -592,7 +592,7 @@ class InterpreterBase:
return self.builtin[varname]
if varname in self.variables:
return self.variables[varname]
- raise InvalidCode('Unknown variable "%s".' % varname)
+ raise InvalidCode(f'Unknown variable "{varname}".')
def validate_extraction(self, buildtarget: mesonlib.HoldableObject) -> None:
raise InterpreterException('validate_extraction is not implemented in this context (please file a bug)')