diff --git a/scripts/modinfo-generate.py b/scripts/modinfo-generate.py index 63093a0f82..8011c842ca 100644 --- a/scripts/modinfo-generate.py +++ b/scripts/modinfo-generate.py @@ -9,7 +9,7 @@ def print_array(name: str, values: list[str]) -> None: if len(values) == 0: return list = ", ".join(values) - print(" .%s = ((const char*[]){ %s, NULL })," % (name, list)) + print(f" .{name} = ((const char*[]){{ {list}, NULL }}),") def parse_line(line: str) -> tuple[str, str]: kind = "" @@ -53,17 +53,16 @@ def generate(name: str, lines: list[str], enabled: set[str]) -> Optional[set[str # don't add a module which dependency is not enabled # in kconfig if data.strip() not in enabled: - print(" /* module {} isn't enabled in Kconfig. */" - .format(data.strip())) + print(f" /* module {data.strip()} isn't enabled in Kconfig. */") print("/* },{ */") return None else: print("unknown:", kind) exit(1) - print(" .name = \"%s\"," % name) + print(f' .name = "{name}",') if arch != "": - print(" .arch = %s," % arch) + print(f" .arch = {arch},") print_array("objs", objs) print_array("deps", deps) print_array("opts", opts) @@ -100,7 +99,7 @@ def main(args: list[str]) -> None: for modinfo in args[2:]: with open(modinfo) as f: lines = f.readlines() - print(" /* %s */" % modinfo) + print(f" /* {modinfo} */") (basename, _) = os.path.splitext(modinfo) moddeps = generate(basename, lines, enabled) if moddeps is not None: @@ -110,8 +109,7 @@ def main(args: list[str]) -> None: error = False for dep in deps.difference(modules): - print("Dependency {} cannot be satisfied".format(dep), - file=sys.stderr) + print(f"Dependency {dep} cannot be satisfied", file=sys.stderr) error = True if error: