From 2ac293844a101f6a05d047590c3733d0054afa45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 14 Jan 2025 00:51:54 +0100 Subject: [PATCH] Continued: - some more PEP8 compliance by using `if 'foo' not in bar` style --- fba/boot.py | 1 + fba/commands.py | 12 ++++++------ fba/networks/misskey.py | 2 +- fba/utils.py | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fba/boot.py b/fba/boot.py index 5b9f584..3969d92 100644 --- a/fba/boot.py +++ b/fba/boot.py @@ -25,6 +25,7 @@ from fba.helpers import locking logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) +#logger.setLevel(logging.DEBUG) # Argument parser _PARSER = None diff --git a/fba/commands.py b/fba/commands.py index 4e13cfd..23dc506 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -575,10 +575,10 @@ def fetch_observer(args: argparse.Namespace) -> int: elif "error_message" in raw: logger.warning("source_domain='%s' has caused error message: '%s' - SKIPPED!", raw["domain"], raw["error_message"]) continue - elif not "data" in raw["json"]: + elif "data" not in raw["json"]: logger.warning("Cannot find key 'nodes' in raw[json]()=%d", len(raw["json"])) continue - elif not "nodes" in raw["json"]["data"]: + elif "nodes" not in raw["json"]["data"]: logger.warning("Cannot find key 'nodes' in raw[json][data]()=%d", len(raw["json"]["data"])) continue @@ -592,7 +592,7 @@ def fetch_observer(args: argparse.Namespace) -> int: logger.info("Checking %d items,software='%s' ...", len(items), software) for item in items: logger.debug("item[]='%s'", type(item)) - if not "domain" in item: + if "domain" not in item: logger.debug("item()=%d has not element 'domain'", len(item)) continue @@ -793,7 +793,7 @@ def fetch_cs(args: argparse.Namespace): for row in blocklist[block_level]: logger.debug("row[%s]='%s'", type(row), row) - if not "domain" in row: + if "domain" not in row: logger.warning("row[]='%s' has no element 'domain' - SKIPPED!", type(row)) continue elif not instances.is_registered(row["domain"]): @@ -1823,10 +1823,10 @@ def fetch_relays(args: argparse.Namespace) -> int: elif "json" not in raw: logger.warning("raw()=%d does not contain key 'json' in response - SKIPPED!", len(raw)) continue - elif not "metadata" in raw["json"]: + elif "metadata" not in raw["json"]: logger.warning("raw[json]()=%d does not contain key 'json' in response - SKIPPED!", len(raw["json"])) continue - elif not "peers" in raw["json"]["metadata"]: + elif "peers" not in raw["json"]["metadata"]: logger.warning("raw[json][metadata()=%d does not contain key 'json' in response - SKIPPED!", len(raw["json"]["metadata"])) continue else: diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py index e8d2d3b..d4a97c8 100644 --- a/fba/networks/misskey.py +++ b/fba/networks/misskey.py @@ -301,7 +301,7 @@ def fetch_blocks(domain: str) -> list: if not isinstance(instance, dict): logger.warning("instance[]='%s' is not of type 'dict' - SKIPPED!", type(instance)) continue - elif not "host" in instance: + elif "host" not in instance: logger.warning("instance()=%d has no element 'host' - SKIPPED!", len(instance)) continue elif not isinstance(instance["host"], str): diff --git a/fba/utils.py b/fba/utils.py index a6a3faf..39295f3 100644 --- a/fba/utils.py +++ b/fba/utils.py @@ -28,6 +28,7 @@ from fba.models import instances logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) +#logger.setLevel(logging.DEBUG) ##### Other functions ##### -- 2.39.5