From 0f090147efcf8b7cd16a4aceaf5e511faf3f2aea Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 28 Jan 2022 16:32:48 -0800 Subject: interpreter: delete now unnecessary code Only func_configure_file could reach this code, but now it cannot due to the use of typed_kwargs, so delete it. --- mesonbuild/interpreter/interpreter.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 655a67b..97ec7c8 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -730,8 +730,6 @@ external dependencies (including libraries) must go to "dependencies".''') mlog.warning(implicit_check_false_warning, once=True) check = False - m = 'must be a string, or the output of find_program(), files() '\ - 'or configure_file(), or a compiler object; not {!r}' overridden_msg = ('Program {!r} was overridden with the compiled ' 'executable {!r} and therefore cannot be used during ' 'configuration') @@ -753,9 +751,6 @@ external dependencies (including libraries) must go to "dependencies".''') else: if isinstance(cmd, mesonlib.File): cmd = cmd.absolute_path(srcdir, builddir) - # FIXME: This case can only be reached through configure_file, delete once that is typesafe - elif not isinstance(cmd, str): - raise InterpreterException('First argument ' + m.format(cmd)) # Prefer scripts in the current source directory search_dir = os.path.join(srcdir, self.subdir) prog = ExternalProgram(cmd, silent=True, search_dir=search_dir) -- cgit v1.1