Continued:

- fixed some pylint warnings/errors

diff --git a/daemon.py b/daemon.py
index 5ce1dad3c32cd5fd6a8ae7ac1fca7182ba323879..7120f7bc86ecf859d7076dd4354dd888be1b0655 100755 (executable)
--- a/daemon.py
+++ b/daemon.py
@@ -102,7 +102,7 @@ def api_scoreboard(mode: str, amount: int) -> None:
     else:
         raise HTTPException(status_code=400, detail="No filter specified")
 
-    scores = list()
+    scores = []
 
     for row in database.cursor.fetchall():
         scores.append({
@@ -331,7 +331,7 @@ def nodeinfo_1_0(request: Request) -> None:
 @router.get(config.get("base_url") + "/api/v1/instance/domain_blocks", response_class=JSONResponse)
 def api_domain_blocks(request: Request) -> None:
     blocked = blacklist.get_all()
-    blocking = list()
+    blocking = []
 
     for block in blocked:
         blocking.append({
@@ -347,7 +347,7 @@ def api_domain_blocks(request: Request) -> None:
 def api_peers(request: Request) -> None:
     database.cursor.execute("SELECT domain FROM instances WHERE nodeinfo_url IS NOT NULL")
 
-    peers = list()
+    peers = []
     for row in database.cursor.fetchall():
         peers.append(row["domain"])
 
@@ -391,7 +391,7 @@ def list_domains(request: Request, mode: str, value: str, amount: int = config.g
         timeout=config.timeout
     )
 
-    domainlist = list()
+    domainlist = []
     if response is not None and response.ok:
         domainlist = response.json()
         tformat = config.get("timestamp_format")
@@ -423,7 +423,7 @@ def top(request: Request, mode: str, value: str, amount: int = config.get("api_l
     )
 
     found = 0
-    blocklist = list()
+    blocklist = []
     if response.ok and response.status_code == 200 and len(response.text) > 0:
         blocklist = response.json()
 
@@ -468,7 +468,7 @@ def infos(request: Request, domain: str) -> None:
 
     # Format timestamps
     tformat = config.get("timestamp_format")
-    instance = dict()
+    instance = {}
     for key in domain_data.keys():
         if key in ["last_nodeinfo", "last_blocked", "first_seen", "last_updated", "last_instance_fetch"] and isinstance(domain_data[key], float):
             # Timestamps

diff --git a/fba/commands.py b/fba/commands.py
index ee643276dc5723b6eee3fa7969db646a5a91e86d..81ac7283f62bbc7bd8c15569044a0aefc5ce444e 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -134,10 +134,10 @@ def fetch_pixelfed_api(args: argparse.Namespace) -> int:
 
     try:
         logger.debug("Checking CSRF from source_domain='%s' ...", source_domain)
-        headers = csrf.determine(source_domain, dict())
+        headers = csrf.determine(source_domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s) - EXIT!", type(exception), __name__)
-        return list()
+        return []
 
     try:
         logger.info("Fetching JSON from pixelfed.org API, headers()=%d ...", len(headers))
@@ -196,7 +196,7 @@ def fetch_bkali(args: argparse.Namespace) -> int:
         logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain)
         sources.update(source_domain)
 
-    domains = list()
+    domains = []
     try:
         logger.info("Fetching domainlist from source_domain='%s' ...", source_domain)
         fetched = network.post_json_api(
@@ -358,7 +358,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
         logger.debug("Invoking instances.set_total_blocks(%s, %d) ...", row["domain"], len(blocking))
         instances.set_total_blocks(row["domain"], blocking)
 
-        blockdict = list()
+        blockdict = []
         deobfuscated = obfuscated = 0
 
         logger.info("Checking %d entries from row[domain]='%s',row[software]='%s' ...", len(blocking), row["domain"], row["software"])
@@ -366,7 +366,7 @@ def fetch_blocks(args: argparse.Namespace) -> int:
             logger.debug("blocked='%s',block_level='%s',reason='%s'", block["blocked"], block["block_level"], block["reason"])
 
             if block["block_level"] in [None, ""]:
-                logger.warning("block_level='%s' is empty, row[domain]='%s',block[blocked]='%s'", block_level, block["blocker"], block["blocked"])
+                logger.warning("block[block_level]='%s' is empty, row[domain]='%s',block[blocked]='%s'", block["block_level"], block["blocker"], block["blocked"])
                 continue
 
             logger.debug("block[blocked]='%s',block[reason]='%s' - BEFORE!", block["blocked"], block["reason"])
@@ -507,7 +507,7 @@ def fetch_observer(args: argparse.Namespace) -> int:
         logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain)
         sources.update(source_domain)
 
-    types = list()
+    types = []
     if args.software is None:
         logger.info("Fetching software list ...")
         raw = network.fetch_url(
@@ -531,16 +531,16 @@ def fetch_observer(args: argparse.Namespace) -> int:
 
         logger.info("Checking %d menu items ...", len(items))
         for item in items:
-            logger.debug("item[%s]='%s'", type(item), item)
+            logger.debug("item[%s]='%s' - BEFORE!", type(item), item)
             domain = item.text.lower()
             domain = tidyup.domain(domain) if domain is not None and len(domain) > 0 else None
+            logger.debug("domain='%s' - AFTER!", domain)
 
-            logger.debug("domain='%s'", domain)
             if domain is None:
-                logger.debug("Skipping empty domain in tag='%s' - SKIPPED!", tag)
+                logger.debug("Skipping empty domain in item='%s' - SKIPPED!", item)
                 continue
             elif domain == "all":
-                logger.debug("Skipping 'All' menu entry in tag='%s' - SKIPPED!", tag)
+                logger.debug("Skipping 'All' menu entry in item='%s' - SKIPPED!", item)
                 continue
 
             logger.debug("Appending domain='%s' ...", domain)
@@ -557,7 +557,7 @@ def fetch_observer(args: argparse.Namespace) -> int:
             logger.debug("args.software='%s' does not match software='%s' - SKIPPED!", args.software, software)
             continue
 
-        items = list()
+        items = []
         try:
             logger.debug("Fetching table data for software='%s' ...", software)
             raw = network.post_json_api(
@@ -642,8 +642,8 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int:
         sources.update(source_domain)
 
     blocklist = {
-        "silenced": list(),
-        "rejected": list(),
+        "silenced": [],
+        "rejected": [],
     }
 
     logger.debug("Fetching domainblocks from source_domain='%s'", source_domain)
@@ -672,7 +672,7 @@ def fetch_todon_wiki(args: argparse.Namespace) -> int:
     instances.set_last_blocked(blocker)
     instances.set_total_blocks(blocker, blocking)
 
-    blockdict = list()
+    blockdict = []
     for block_level in blocklist:
         logger.debug("block_level='%s'", block_level)
         blockers = blocklist[block_level]
@@ -747,8 +747,8 @@ def fetch_cs(args: argparse.Namespace):
     ]
 
     blocklist = {
-        "silenced": list(),
-        "rejected": list(),
+        "silenced": [],
+        "rejected": [],
     }
 
     source_domain = "meta.chaos.social"
@@ -787,7 +787,7 @@ def fetch_cs(args: argparse.Namespace):
 
     logger.debug("blocklist[silenced]()=%d,blocklist[reject]()=%d", len(blocklist["silenced"]), len(blocklist["rejected"]))
     if len(blocking) > 0:
-        blockdict = list()
+        blockdict = []
         for block_level in blocklist:
             logger.info("block_level='%s' has %d row(s)", block_level, len(blocklist[block_level]))
 
@@ -830,7 +830,7 @@ def fetch_cs(args: argparse.Namespace):
 def fetch_fba_rss(args: argparse.Namespace) -> int:
     logger.debug("args[]='%s' - CALLED!", type(args))
 
-    domains = list()
+    domains = []
 
     logger.debug("Invoking locking.acquire() ...")
     locking.acquire()
@@ -923,7 +923,7 @@ def fetch_fbabot_atom(args: argparse.Namespace) -> int:
         logger.debug("source_domain='%s' has not been recently used, marking ...", source_domain)
         sources.update(source_domain)
 
-    domains = list()
+    domains = []
 
     logger.info("Fetching ATOM feed='%s' from FBA bot account ...", feed)
     response = network.fetch_url(feed, network.web_headers, config.timeout)
@@ -995,7 +995,7 @@ def fetch_instances(args: argparse.Namespace) -> int:
     locking.acquire()
 
     # Init variables
-    rows = list()
+    rows = []
 
     # Is domain or software set?
     if args.domain not in [None, ""]:
@@ -1418,7 +1418,7 @@ def recheck_obfuscation(args: argparse.Namespace) -> int:
             instances.set_total_blocks(row["domain"], blocking)
 
         obfuscated = 0
-        blockdict = list()
+        blockdict = []
 
         logger.info("Checking %d block(s) from row[domain]='%s' ...", len(blocking), row["domain"])
         for block in blocking:
@@ -1658,7 +1658,7 @@ def fetch_instances_social(args: argparse.Namespace) -> int:
     locking.acquire()
 
     source_domain = "instances.social"
-    domains = list()
+    domains = []
 
     if config.get("instances_social_api_key") == "":
         logger.error("API key not set. Please set in your config.json file.")
@@ -1734,7 +1734,7 @@ def fetch_relaylist(args: argparse.Namespace) -> int:
         "/relays"
     )
 
-    domains = list()
+    domains = []
 
     logger.info("Checking %d row(s) ...", len(rows))
     for row in rows:
@@ -1785,7 +1785,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
         logger.debug("Fetch all relay instances ...")
         database.cursor.execute("SELECT domain, software, nodeinfo_url FROM instances WHERE software IN ('activityrelay', 'aoderelay', 'selective-relay', 'pub-relay') AND nodeinfo_url IS NOT NULL ORDER BY last_updated DESC")
 
-    domains = list()
+    domains = []
     rows = database.cursor.fetchall()
 
     logger.info("Checking %d relays ...", len(rows))
@@ -1798,7 +1798,7 @@ def fetch_relays(args: argparse.Namespace) -> int:
             logger.warning("row[domain]='%s' has empty nodeinfo_url but this is required - SKIPPED!", row["domain"])
             continue
 
-        peers = list()
+        peers = []
         try:
             logger.debug("row[domain]='%s',row[software]='%s' - checking ....", row["domain"], row["software"])
             if row["software"] == "pub-relay":

diff --git a/fba/helpers/cache.py b/fba/helpers/cache.py
index 8299d28b49da4c90c12980007393d95f85cd84bc..5d2156102a077dca6c485cb5b918b7bbd553a344 100644 (file)
--- a/fba/helpers/cache.py
+++ b/fba/helpers/cache.py
@@ -38,7 +38,7 @@ def set_all(key: str, rows: list, value: any) -> None:
         raise ValueError(f"Parameter key[]='{type(key)}' is not of type 'str'")
     elif not key_exists(key):
         logger.debug("Cache for key='%s' not initialized.", key)
-        _cache[key] = dict()
+        _cache[key] = {}
 
     logger.debug("Setting %d row(s) for key='%s',value[%s]='%s' ...", len(rows), key, type(value), value)
     for sub in rows:

diff --git a/fba/helpers/cookies.py b/fba/helpers/cookies.py
index edfbd188fee5b256a27ee83519f143d182653f1e..8a34add3742b61ccb2fe3f7b3c156db27bc770fa 100644 (file)
--- a/fba/helpers/cookies.py
+++ b/fba/helpers/cookies.py
@@ -46,7 +46,7 @@ def get_all(domain: str) -> dict:
     if blacklist.is_blacklisted(domain):
         raise ValueError(f"domain='{domain}' is blacklisted but function was invoked")
     elif domain not in _cookies:
-        return dict()
+        return []
 
     logger.debug("_cookies[%s]()=%d - EXIT!", domain, len(_cookies[domain]))
     return _cookies[domain]

diff --git a/fba/helpers/json.py b/fba/helpers/json.py
index b862d73ebd28da55ac7a5b185676f7e824f82b9f..cc37e990211fb2ca8fbab718f211b6c8ce8be6f8 100644 (file)
--- a/fba/helpers/json.py
+++ b/fba/helpers/json.py
@@ -46,7 +46,7 @@ def from_response(response: requests.models.Response) -> any:
     elif response.text.strip() != "" and not is_json_response(response):
         logger.warning("response.headers[content-type]='%s' is not a JSON type, below json() invocation may raise an exception", response.headers.get("content-type"))
 
-    data = list()
+    data = []
     raw  = response.text.strip()
 
     logger.debug("raw()=%d", len(raw))

diff --git a/fba/helpers/processing.py b/fba/helpers/processing.py
index 88704610da4bb72939e16093b5d986738e2fca2b..dfe2b203d70fead23557ee641d107a6ec6aa43f6 100644 (file)
--- a/fba/helpers/processing.py
+++ b/fba/helpers/processing.py
@@ -142,7 +142,7 @@ def csv_block(blocker: str, url: str, command: str) -> None:
     logger.debug("Setting last_blocked for blocker='%s' ...", blocker)
     instances.set_last_blocked(blocker)
 
-    domains = list()
+    domains = []
 
     # Fetch this URL
     logger.info("Fetching url='%s' for blocker='%s' ...", url, blocker)
@@ -164,7 +164,7 @@ def csv_block(blocker: str, url: str, command: str) -> None:
     rows = list(reader)
 
     # Init local variables
-    blockdict = list()
+    blockdict = []
     cnt = 0
 
     logger.info("Checking %d CSV lines ...", len(rows))

diff --git a/fba/http/federation.py b/fba/http/federation.py
index 7f2ce0d17ee5f1de307f1ed89885d90d832f8eda..665b1600a8137a025554661b1cfc778978ee9ecd 100644 (file)
--- a/fba/http/federation.py
+++ b/fba/http/federation.py
@@ -109,7 +109,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     logger.debug("Updating last_instance_fetch for domain='%s' ...", domain)
     instances.set_last_instance_fetch(domain)
 
-    peerlist = list()
+    peerlist = []
     logger.debug("software='%s'", software)
     if software is not None:
         try:
@@ -252,16 +252,16 @@ def fetch_peers(domain: str, software: str, origin: str) -> list:
 
     try:
         logger.debug("Checking CSRF for domain='%s'", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     # Init peers variable
-    peers = list()
+    peers = []
 
     logger.debug("Checking %d API paths ...", len(_api_paths))
     for path in _api_paths:
@@ -280,7 +280,7 @@ def fetch_peers(domain: str, software: str, origin: str) -> list:
 
     if not isinstance(peers, list):
         logger.warning("peers[]='%s' is not of type 'list', maybe bad API response?", type(peers))
-        peers = list()
+        peers = []
 
     logger.debug("Invoking instances.set_total_peers(%s,%d) ...", domain, len(peers))
     instances.set_total_peers(domain, peers)
@@ -485,35 +485,35 @@ def determine_software(domain: str, path: str = None) -> str:
     logger.debug("software[%s]='%s' - EXIT!", type(software), software)
     return software
 
-def find_domains(tag: bs4.element.Tag, domainColumn: str = "dt", reasonColumn: str = "dd", reasonText: str = "Categories:") -> list:
-    logger.debug("tag[]='%s',domainColumn='%s',reasonColumn='%s',reasonText='%s' - CALLED!", type(tag), domainColumn, reasonColumn, reasonText)
+def find_domains(tag: bs4.element.Tag, domain_column: str = "dt", reason_column: str = "dd", reason_text: str = "Categories:") -> list:
+    logger.debug("tag[]='%s',domain_column='%s',reason_column='%s',reason_text='%s' - CALLED!", type(tag), domain_column, reason_column, reason_text)
 
     if not isinstance(tag, bs4.element.Tag):
         raise ValueError(f"Parameter tag[]='{type(tag)}' is not type of bs4.element.Tag")
-    elif not isinstance(domainColumn, str):
-        raise ValueError(f"Parameter domainColumn[]='{type(domainColumn)}' is not type of 'str'")
-    elif domainColumn == "":
-        raise ValueError("Parameter 'domainColumn' is an empty string")
-    elif not isinstance(reasonColumn, str):
-        raise ValueError(f"Parameter reasonColumn[]='{type(reasonColumn)}' is not type of 'str'")
-    elif reasonColumn == "":
-        raise ValueError("Parameter 'reasonColumn' is an empty string")
-    elif len(tag.find_all(domainColumn)) == 0:
-        raise KeyError("No domainColumn='{domainColumn}' rows found in table!")
-    elif len(tag.find_all(reasonColumn)) == 0:
-        raise KeyError("No reasonColumn='{reasonColumn}' rows found in table!")
-    elif not isinstance(reasonText, str):
-        raise ValueError(f"Parameter reasonText[]='{type(reasonText)}' is not type of 'str'")
-    elif reasonText == "":
-        raise ValueError("Parameter 'reasonText' is an empty string")
-
-    domains = list()
-    for element in tag.find_all(domainColumn):
+    elif not isinstance(domain_column, str):
+        raise ValueError(f"Parameter domain_column[]='{type(domain_column)}' is not type of 'str'")
+    elif domain_column == "":
+        raise ValueError("Parameter 'domain_column' is an empty string")
+    elif not isinstance(reason_column, str):
+        raise ValueError(f"Parameter reason_column[]='{type(reason_column)}' is not type of 'str'")
+    elif reason_column == "":
+        raise ValueError("Parameter 'reason_column' is an empty string")
+    elif len(tag.find_all(domain_column)) == 0:
+        raise KeyError("No domain_column='{domain_column}' rows found in table!")
+    elif len(tag.find_all(reason_column)) == 0:
+        raise KeyError("No reason_column='{reason_column}' rows found in table!")
+    elif not isinstance(reason_text, str):
+        raise ValueError(f"Parameter reason_text[]='{type(reason_text)}' is not type of 'str'")
+    elif reason_text == "":
+        raise ValueError("Parameter 'reason_text' is an empty string")
+
+    domains = []
+    for element in tag.find_all(domain_column):
         logger.debug("element[%s]='%s'", type(element), element)
         domain = tidyup.domain(element.text)
-        reasons = element.find_next(reasonColumn).text.split(reasonText)[1].splitlines()
+        reasons = element.find_next(reason_column).text.split(reason_text)[1].splitlines()
+        logger.debug("domain='%s',reasons(%d)='%s'", domain, len(reasons), reasons)
 
-        logger.debug("reasons(%d)='%s'", len(reasons), reasons)
         reason = ""
         for r in reasons:
             logger.debug("r[%s]='%s'", type(r), r)
@@ -564,7 +564,7 @@ def add_peers(rows: dict) -> list:
         raise ValueError("Parameter 'rows' is empty")
 
     # Init variables
-    peers = list()
+    peers = []
 
     for key in ["linked", "allowed", "blocked"]:
         logger.debug("key='%s'", key)
@@ -608,20 +608,20 @@ def fetch_blocks(domain: str) -> list:
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
     # Init block list
-    blocklist = list()
+    blocklist = []
 
     # No CSRF by default, you don't have to add network.api_headers by yourself here
-    headers = dict()
+    headers = {}
 
     try:
         logger.debug("Checking CSRF for domain='%s'", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_blocks,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     try:
         # json endpoint for newer mastodongs

diff --git a/fba/http/network.py b/fba/http/network.py
index 779ad2d366676c1b5ddd4acfbaee706e8758be3a..33f940e5071f0dfc10485c1d8f502e98a4e8f7e1 100644 (file)
--- a/fba/http/network.py
+++ b/fba/http/network.py
@@ -63,7 +63,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 #logger.setLevel(logging.DEBUG)
 
-def post_json_api(domain: str, path: str, data: str = "", headers: dict = dict()) -> dict:
+def post_json_api(domain: str, path: str, data: str = "", headers: dict = {}) -> dict:
     logger.debug("domain='%s',path='%s',data='%s',headers()=%d - CALLED!", domain, path, data, len(headers))
     domain_helper.raise_on(domain)
 
@@ -360,8 +360,8 @@ def fetch_url(url: str, headers: dict, timeout: tuple) -> requests.models.Respon
         response = fetch_response(
             components.netloc.split(":")[0],
             components.path if isinstance(components.path, str) and components.path != '' else '/',
-            headers,
-            timeout
+            headers=headers,
+            timeout=timeout
         )
 
     logger.debug("response[]='%s' - EXIT!", type(response))
@@ -400,15 +400,15 @@ def fetch_json_rows(hostname: str, path: str, headers: dict = {}, rows_key: str
 
     if "error_message" in fetched:
         logger.warning("Error during fetching API result: '%s' - EXIT!", fetched["error_message"])
-        return list()
+        return []
     elif "exception" in fetched:
         logger.warning("Exception '%s' during fetching API result - EXIT!", type(fetched["exception"]))
-        return list()
+        return []
     elif "json" not in fetched:
         raise KeyError("fetched has no element 'json'")
     elif rows_key not in[None, ""] and rows_key not in fetched["json"]:
         raise KeyError(f"fetched[row] has no element '{rows_key}'")
-    elif rows_key == None:
+    elif rows_key is None:
         logger.debug("Parameter 'rows_key' is not set, using whole fetched['json'] as rows ...")
         rows = fetched["json"]
     else:

diff --git a/fba/http/nodeinfo.py b/fba/http/nodeinfo.py
index 78143fa7cc27742c3a68a8e256456f7c1d5b3729..882fdbb2ff14a7bc7c5d0ab4e89ae2fae26f1a6b 100644 (file)
--- a/fba/http/nodeinfo.py
+++ b/fba/http/nodeinfo.py
@@ -90,11 +90,11 @@ def fetch(domain: str, path: str = None, update_mode: bool = True) -> dict:
 
     # No CSRF by default, you don't have to add network.api_headers by yourself here
     headers = tuple()
-    data = dict()
+    data = {}
 
     try:
         logger.debug("Checking CSRF for domain='%s'", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
         logger.debug("headers()=%d", len(headers))
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (nodeinfo,%s) - EXIT!", type(exception), __name__)
@@ -154,7 +154,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
 
     try:
         logger.debug("Checking CSRF for domain='%s'", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_wellknown_nodeinfo,%s) - EXIT!", type(exception), __name__)
         instances.set_last_error(domain, exception)
@@ -164,7 +164,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
             "exception"    : exception,
         }
 
-    data = dict()
+    data = {}
 
     logger.debug("Fetching .well-known info for domain='%s'", domain)
     for path in _well_known_nodeinfo_urls:
@@ -190,7 +190,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
         return data
     elif "json" not in data:
         logger.warning("domain='%s' returned no 'json' key - EXIT!", domain)
-        return dict()
+        return []
 
     infos = data["json"]
     logger.debug("infos(%d)[]='%s' has been returned", len(infos), type(infos))
@@ -201,7 +201,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
 
         logger.debug("Checking %d nodeinfo ids ...", len(_nodeinfo_identifier))
         for niid in _nodeinfo_identifier:
-            data = dict()
+            data = {}
 
             logger.debug("Checking niid='%s' for infos[links]()=%d ...", niid, len(infos["links"]))
             for link in infos["links"]:

diff --git a/fba/models/instances.py b/fba/models/instances.py
index 2f39d860590a6e7501508fa3b68232894c41ed35..3e376db865de2eb3fe9852564bd677271fef7d96 100644 (file)
--- a/fba/models/instances.py
+++ b/fba/models/instances.py
@@ -136,7 +136,7 @@ def update(domain: str) -> None:
         raise Exception(f"domain='{domain}' is blacklisted but function has been invoked")
 
     sql_string = ""
-    fields = list()
+    fields = []
 
     logger.debug("Checking %d _pending array elements ...", len(_pending))
     for key in _pending:

diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py
index 11ec4980c768c5ecee5ba12875c6921f8c106bb6..d057a27e20e1a0be8f0db8d3ed54e43de5a8c665 100644 (file)
--- a/fba/networks/friendica.py
+++ b/fba/networks/friendica.py
@@ -39,7 +39,7 @@ def fetch_blocks(domain: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
-    blocklist = list()
+    blocklist = []
     block_tag = None
 
     try:
@@ -60,19 +60,19 @@ def fetch_blocks(domain: str) -> list:
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     logger.debug("block_tag[%s]='%s'", type(block_tag), block_tag)
     if block_tag is None:
         logger.debug("Instance has no block list: domain='%s' - EXIT!", domain)
-        return list()
+        return []
 
     table = block_tag.find("table")
 
     logger.debug("table[]='%s'", type(table))
     if table is None:
         logger.warning("domain='%s' has no table tag - EXIT !", domain)
-        return list()
+        return []
     elif table.find("tbody"):
         rows = table.find("tbody").find_all("tr")
     else:

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 4b2929ec0ff50409444dce2e2bc0b29a2b88a3c4..e0bad16fa350018e7ed777765ee5fa5cf8b4dc16 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -77,20 +77,20 @@ def fetch_peers(domain: str, origin: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
-    peers = list()
+    peers = []
 
     # No CSRF by default, you don't have to add network.api_headers by yourself here
     headers = tuple()
 
     try:
         logger.debug("Checking CSRF for domain='%s' ...", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     try:
         logger.debug("Fetching '/api/v3/site' from domain='%s' ...", domain)
@@ -135,7 +135,7 @@ def fetch_blocks(domain: str) -> list:
     elif not instances.is_registered(domain):
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
-    blocklist = list()
+    blocklist = []
 
     try:
         # json endpoint for newer mastodongs
@@ -244,7 +244,7 @@ def fetch_instances(domain: str, origin: str) -> list:
     if blacklist.is_blacklisted(domain):
         raise Exception(f"domain='{domain}' is blacklisted but function is invoked")
 
-    peers = list()
+    peers = []
 
     try:
         # json endpoint for newer mastodongs
@@ -328,7 +328,7 @@ def parse_script(doc: bs4.BeautifulSoup, only: str = None) -> list:
         raise ValueError("Parameter 'only' is empty")
 
     scripts = doc.find_all("script")
-    peers = list()
+    peers = []
 
     logger.debug("scripts()=%d", len(scripts))
     for script in scripts:
@@ -351,7 +351,7 @@ def parse_script(doc: bs4.BeautifulSoup, only: str = None) -> list:
             parsed = json.loads(iso_data)
         except json.decoder.JSONDecodeError as exception:
             logger.warning("Exception '%s' during parsing %d Bytes: '%s' - EXIT!", type(exception), len(iso_data), str(exception))
-            return list()
+            return []
 
         logger.debug("parsed[%s]()=%d", type(parsed), len(parsed))
 

diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py
index ca24687b3a929604b54beb35192f82f67c0b3fe7..b900eccd111b28afb176e90906df381c2393fd95 100644 (file)
--- a/fba/networks/mastodon.py
+++ b/fba/networks/mastodon.py
@@ -110,7 +110,7 @@ def fetch_blocks_from_about(domain: str) -> dict:
     logger.debug("doc[]='%s'", type(doc))
     if doc is None:
         logger.warning("Cannot fetch any /about pages for domain='%s' - EXIT!", domain)
-        return list()
+        return []
 
     for header in doc.find_all("h3"):
         header_text = tidyup.reason(header.text)
@@ -172,7 +172,7 @@ def fetch_blocks(domain: str) -> list:
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
     # Init variables
-    blocklist = list()
+    blocklist = []
 
     logger.debug("Invoking fetch_blocks_from_about(%s) ...", domain)
     rows = fetch_blocks_from_about(domain)

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index a8bda4a96635869aaac871de210639ea7bd6a743..e8d2d3b21d46444a97019ba93bf0f3070d04bbd5 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -42,7 +42,7 @@ def fetch_peers(domain: str) -> list:
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
     logger.debug("domain='%s' is misskey, sending API POST request ...", domain)
-    peers  = list()
+    peers  = []
     offset = 0
     step   = config.get("misskey_limit")
 
@@ -51,13 +51,13 @@ def fetch_peers(domain: str) -> list:
 
     try:
         logger.debug("Checking CSRF for domain='%s'", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     # iterating through all "suspended" (follow-only in its terminology)
     # instances page-by-page, since that troonware doesn't support
@@ -145,15 +145,15 @@ def fetch_blocks(domain: str) -> list:
 
     try:
         logger.debug("Checking CSRF for domain='%s' ...", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_blocks,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
-    blocklist = list()
+    blocklist = []
     offset    = 0
     step      = config.get("misskey_limit")
 

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index c0d88e48616148b33cc09a02f37bbde10935ffb9..a818ac5692f7331155b011a51879b65442ba8036 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -38,19 +38,19 @@ def fetch_peers(domain: str) -> list:
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
     # Init variables
-    peers   = list()
+    peers   = []
     headers = tuple()
     start   = 0
 
     try:
         logger.debug("Checking CSRF for domain='%s' ...", domain)
-        headers = csrf.determine(domain, dict())
+        headers = csrf.determine(domain, {})
     except network.exceptions as exception:
         logger.warning("Exception '%s' during checking CSRF (fetch_peers,%s)", type(exception), __name__)
         instances.set_last_error(domain, exception)
 
         logger.debug("Returning empty list ... - EXIT!")
-        return list()
+        return []
 
     for mode in ["followers", "following"]:
         logger.debug("domain='%s',mode='%s'", domain, mode)

diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py
index 181c1785397fc8a4dc5b38864b8468bf2b6ea332..7e66bc30e7deeaecc20b4d62386e7a322a2248bd 100644 (file)
--- a/fba/networks/pleroma.py
+++ b/fba/networks/pleroma.py
@@ -61,7 +61,7 @@ def fetch_blocks(domain: str) -> list:
         raise Exception(f"domain='{domain}' is not registered but function is invoked")
 
     # Init variables
-    blockdict = list()
+    blockdict = []
     rows = None
 
     try:
@@ -74,10 +74,10 @@ def fetch_blocks(domain: str) -> list:
             instances.update(domain)
 
             logger.debug("Returning empty list ... - EXIT!")
-            return list()
+            return []
         elif "exception" in rows:
             logger.warning("Exception '%s' during fetching nodeinfo for domain='%s' - EXIT!", type(rows["exception"]), domain)
-            return list()
+            return []
         elif "json" in rows:
             logger.debug("rows[json] found for domain='%s'", domain)
             rows = rows["json"]
@@ -89,13 +89,13 @@ def fetch_blocks(domain: str) -> list:
     logger.debug("rows[]='%s'", type(rows))
     if rows is None:
         logger.warning("Could not fetch nodeinfo from domain='%s' - EXIT!", domain)
-        return list()
+        return []
     elif "metadata" not in rows:
         logger.warning("rows()=%d does not have key 'metadata', domain='%s' - EXIT!", len(rows), domain)
-        return list()
+        return []
     elif "federation" not in rows["metadata"]:
         logger.warning("rows()=%d does not have key 'federation', domain='%s' - EXIT!", len(rows["metadata"]), domain)
-        return list()
+        return []
 
     found = False
     data = rows["metadata"]["federation"]
@@ -341,14 +341,14 @@ def fetch_blocks_from_about(domain: str) -> dict:
     logger.debug("doc[]='%s'", type(doc))
     if doc is None:
         logger.warning("Cannot fetch any /about pages for domain='%s' - EXIT!", domain)
-        return list()
+        return []
 
     headers = doc.find_all("h2")
 
     logger.debug("headers[]='%s'", type(headers))
     if headers is None:
         logger.warning("Cannot fetch any /about pages for domain='%s' - EXIT!", domain)
-        return list()
+        return []
 
     logger.info("Checking %d headers ...", len(headers))
     for header in headers:

diff --git a/fba/utils.py b/fba/utils.py
index aa58a754f425b73125f6cd61b92f11f81e4f5eb9..8402a0c81b2e6d76869a57870a0e17fac9351375 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -51,7 +51,7 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
     elif search == "":
         raise ValueError("Parameter 'search' is empty")
 
-    domains = list()
+    domains = []
     logger.debug("Parsing %d tags ...", len(tags))
     for tag in tags:
         logger.debug("tag[]='%s'", type(tag))