From 755d1483cdaf49ad14b1368437a6e225374d1c1c Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 18 Oct 2026 13:48:30 +0300 Subject: [PATCH 1/5] Added f-strings in smoke_nse.py Signed-off-by: Shadow --- tools/smoke_nse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/smoke_nse.py b/tools/smoke_nse.py index fef85fd..6fd0150 100644 --- a/tools/smoke_nse.py +++ b/tools/smoke_nse.py @@ -1160,7 +1160,7 @@ def main(argv): elif not quiet: print("OK %-46s%s" % (rel, out or "")) - print("smoke: %d scripts, %d failures (scenario=%s)" % (checked, failures, scenario)) + print(f"smoke: {checked} scripts, {faulries} failures (scenario={scenario})") return 1 if failures else 0 From 32dd6b3b0bc6cfc571c126e3dc1d3fffe2f43647 Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 18 Oct 2026 13:56:14 +0300 Subject: [PATCH 2/5] Added f-strings in lint_nse.py Signed-off-by: Shadow --- tools/lint_nse.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/lint_nse.py b/tools/lint_nse.py index ae9e685..3fbf40d 100644 --- a/tools/lint_nse.py +++ b/tools/lint_nse.py @@ -157,11 +157,11 @@ def check_file(path, runtime, strict=False): else: chunk, err = result, None if chunk is None: - problems.append("SYNTAX: %s" % err) + problems.append(f"SYNTAX: {err}") for field in HEADER_FIELDS: if not re.search(r"^%s\s*=" % field, text, re.M): - problems.append("MISSING metadata field: %s" % field) + problems.append(f"MISSING metadata field: {field}") if not re.search(r"^(portrule|prerule|hostrule)\s*=", text, re.M): problems.append("MISSING rule declaration (portrule/prerule/hostrule)") @@ -175,7 +175,7 @@ def check_file(path, runtime, strict=False): elif const and used: risk = const.group(1).strip() if risk not in RISKS: - problems.append("MISSING/unknown Risk Level: %r" % risk) + problems.append(f"MISSING/unknown Risk Level: {risk}") body_start = text.find("action = function") if body_start == -1: @@ -183,12 +183,12 @@ def check_file(path, runtime, strict=False): comments = find_comments(text) for lineno, line in comments: - problems.append("COMMENT at line %d: %s" % (lineno, line.strip()[:80])) + problems.append(f"COMMENT at line {lineno}: {line.strip()[:80]}") minimum = RISKS.get(risk, 800) size_ok = count >= minimum if not size_ok: - problems.append("SIZE: %d lines < required %d for %s" % (count, minimum, risk)) + problems.append(f"SIZE: {count} lines < required {minimum} for {risk}") return { "path": path, @@ -226,8 +226,7 @@ def main(argv): bad = [r for r in results if r["problems"]] short = [r for r in results if not r["size_ok"]] - print("checked: %d scripts, %d with problems, %d below size target" % ( - len(results), len(bad), len(short))) + print(f"checked: {len(results)} scripts, {len(bad)} with problems, {len(short)} below size target") for r in results: flag = "OK " if not r["problems"] else "FAIL" print("%s %-46s %5d lines %-14s (min %d)" % ( From c6776d8de53af3eac0c3e532267ee5a27bf09cd2 Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 18 Oct 2026 14:12:01 +0300 Subject: [PATCH 3/5] Update lint_nse.py Signed-off-by: Shadow --- tools/lint_nse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lint_nse.py b/tools/lint_nse.py index 3fbf40d..b643484 100644 --- a/tools/lint_nse.py +++ b/tools/lint_nse.py @@ -232,7 +232,7 @@ def main(argv): print("%s %-46s %5d lines %-14s (min %d)" % ( flag, os.path.relpath(r["path"], root), r["lines"], r["risk"], r["minimum"])) for problem in r["problems"]: - print(" - %s" % problem) + print(f" - {problem}") with open(os.path.join(root, ".lint-report.json"), "w", encoding="utf-8") as fh: json.dump(results, fh, indent=1) From 1764ef854eef79555501aedfe6c2c9647047b740 Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 18 Oct 2026 14:28:30 +0300 Subject: [PATCH 4/5] Fixed a typo Signed-off-by: Shadow --- tools/smoke_nse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/smoke_nse.py b/tools/smoke_nse.py index 6fd0150..3063642 100644 --- a/tools/smoke_nse.py +++ b/tools/smoke_nse.py @@ -1160,7 +1160,7 @@ def main(argv): elif not quiet: print("OK %-46s%s" % (rel, out or "")) - print(f"smoke: {checked} scripts, {faulries} failures (scenario={scenario})") + print(f"smoke: {checked} scripts, {failures} failures (scenario={scenario})") return 1 if failures else 0 From 178ae428791d158047cf8cf017dbcd56787cb403 Mon Sep 17 00:00:00 2001 From: Shadow Date: Sun, 18 Oct 2026 14:29:59 +0300 Subject: [PATCH 5/5] Added !r Signed-off-by: Shadow --- tools/lint_nse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lint_nse.py b/tools/lint_nse.py index b643484..c51d9c0 100644 --- a/tools/lint_nse.py +++ b/tools/lint_nse.py @@ -175,7 +175,7 @@ def check_file(path, runtime, strict=False): elif const and used: risk = const.group(1).strip() if risk not in RISKS: - problems.append(f"MISSING/unknown Risk Level: {risk}") + problems.append(f"MISSING/unknown Risk Level: {risk!r}") body_start = text.find("action = function") if body_start == -1: