From d69521c97e7109acc02bc4de626d2f715b7a8646 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Mon, 31 Jul 2023 10:37:05 +0200
Subject: [PATCH] Refactoring: simplify conditional logic
See for reference:
https://docs.sourcery.ai/Reference/Python/Default-Rules/de-morgan/
---
scripts/.sourcery.yaml | 1 -
scripts/analyze_job_logs.py | 2 +-
scripts/delete_job_artifacts.py | 2 +-
scripts/lava_credentials.py | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/.sourcery.yaml b/scripts/.sourcery.yaml
index 059da1da..0b514de6 100644
--- a/scripts/.sourcery.yaml
+++ b/scripts/.sourcery.yaml
@@ -27,7 +27,6 @@ rule_settings:
- for-append-to-extend
- raise-specific-error
- simplify-len-comparison
- - de-morgan
- use-named-expression
- use-next
diff --git a/scripts/analyze_job_logs.py b/scripts/analyze_job_logs.py
index cf4c5f9c..4872146d 100755
--- a/scripts/analyze_job_logs.py
+++ b/scripts/analyze_job_logs.py
@@ -94,7 +94,7 @@ def main(args):
for job in job_it:
if options.filter_status is not None and job.status != options.filter_status:
continue
- if options.filter_tag is not None and not options.filter_tag in job.tag_list:
+ if options.filter_tag is not None and options.filter_tag not in job.tag_list:
continue
log = bytes.decode(job.trace())
if options.pattern in log:
diff --git a/scripts/delete_job_artifacts.py b/scripts/delete_job_artifacts.py
index 4c160f30..3aa7dc67 100755
--- a/scripts/delete_job_artifacts.py
+++ b/scripts/delete_job_artifacts.py
@@ -87,7 +87,7 @@ def main(args):
continue
if options.filter_status is not None and job.status != options.filter_status:
continue
- if options.filter_tag is not None and not options.filter_tag in job.tag_list:
+ if options.filter_tag is not None and options.filter_tag not in job.tag_list:
continue
job.delete_artifacts()
logging.debug(
diff --git a/scripts/lava_credentials.py b/scripts/lava_credentials.py
index 1be13ddf..bd0f1d1b 100755
--- a/scripts/lava_credentials.py
+++ b/scripts/lava_credentials.py
@@ -59,7 +59,7 @@ def get_lava_credentials(host=None):
if new_data:
valid = {"yes": True, "ye": True, "y": True, "": True, "no": False, "n": False}
choice = None
- while not choice in valid:
+ while choice not in valid:
sys.stdout.write(
"Do you want to save these credentials in '%s'? " "[Y/n] " % configfile
)
--
GitLab