aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-07-04 17:51:42 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2021-07-05 17:55:04 +0300
commitdd31891c1fd6d3b9c955e73bd80170242b6423e5 (patch)
treeb6bfd47a74e3ac4f71904afe2ba1996453ce221b /mesonbuild/cmake
parent566efba216b865bff670901aed98d34f09f8d930 (diff)
downloadmeson-dd31891c1fd6d3b9c955e73bd80170242b6423e5.zip
meson-dd31891c1fd6d3b9c955e73bd80170242b6423e5.tar.gz
meson-dd31891c1fd6d3b9c955e73bd80170242b6423e5.tar.bz2
more f-strings too complex to be caught by pyupgrade
Diffstat (limited to 'mesonbuild/cmake')
-rw-r--r--mesonbuild/cmake/traceparser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py
index c3a9a1b..4ddc915 100644
--- a/mesonbuild/cmake/traceparser.py
+++ b/mesonbuild/cmake/traceparser.py
@@ -157,7 +157,7 @@ class CMakeTraceParser:
# First load the trace (if required)
if not self.requires_stderr():
if not self.trace_file_path.exists and not self.trace_file_path.is_file():
- raise CMakeException('CMake: Trace file "{}" not found'.format(str(self.trace_file_path)))
+ raise CMakeException(f'CMake: Trace file "{self.trace_file_path!s}" not found')
trace = self.trace_file_path.read_text(errors='ignore', encoding='utf-8')
if not trace:
raise CMakeException('CMake: The CMake trace was not provided or is empty')
@@ -652,7 +652,7 @@ class CMakeTraceParser:
if not args:
mlog.error('Invalid preload.cmake script! At least one argument to `meson_ps_disabled_function` is expected')
return
- mlog.warning('The CMake function "{}" was disabled to avoid compatibility issues with Meson.'.format(args[0]))
+ mlog.warning(f'The CMake function "{args[0]}" was disabled to avoid compatibility issues with Meson.')
def _lex_trace_human(self, trace: str) -> T.Generator[CMakeTraceLine, None, None]:
# The trace format is: '<file>(<line>): <func>(<args -- can contain \n> )\n'