Continued:

- wrapped into single quotes

diff --git a/fba/federation.py b/fba/federation.py
index d966bc3878de5e2570145306707db0540266ee9d..754e0d6b8c1fae0eca994cf0e92fbb2176afd174 100644 (file)
--- a/fba/federation.py
+++ b/fba/federation.py
@@ -111,7 +111,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
             print(f"WARNING: Empty instance after tidyup.domain(), domain='{domain}'")
             continue
         elif not validators.domain(instance.split("/")[0]):
-            print(f"WARNING: Bad instance='{instance}' from domain='{domain}',origin='{origin}',software='{software}'")
+            print(f"WARNING: Bad instance='{instance}' from domain='{domain}',origin='{origin}'")
             continue
         elif instance.endswith(".arpa"):
             print(f"WARNING: instance='{instance}' is a reversed .arpa domain and should not be used generally.")
@@ -137,7 +137,7 @@ def fetch_instances(domain: str, origin: str, software: str, command: str, path:
     # DEBUG: print("DEBUG: EXIT!")
 
 def fetch_peers(domain: str, software: str) -> list:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software={software} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}',software='{software}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -211,7 +211,7 @@ def fetch_peers(domain: str, software: str) -> list:
     return peers
 
 def fetch_nodeinfo(domain: str, path: str = None) -> dict:
-    # DEBUG: print(f"DEBUG: domain='{domain}',path={path} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain='{domain}',path='{path}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -352,7 +352,7 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict:
     return data
 
 def fetch_generator_from_path(domain: str, path: str = "/") -> str:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},path={path} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}',path='{path}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -419,7 +419,7 @@ def fetch_generator_from_path(domain: str, path: str = "/") -> str:
     return software
 
 def determine_software(domain: str, path: str = None) -> str:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},path={path} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}',path='{path}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":

diff --git a/fba/network.py b/fba/network.py
index 29ed1db07f865e3b36f9831d7fbe72726017d34a..b4d320d073c48e8db19155e714c34573c6fddf53 100644 (file)
--- a/fba/network.py
+++ b/fba/network.py
@@ -181,7 +181,7 @@ def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
     return json_reply
 
 def send_bot_post(domain: str, blocklist: dict):
-    # DEBUG: print(f"DEBUG: domain={domain},blocklist()={len(blocklist)} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain='{domain}',blocklist()={len(blocklist)} - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index 78e57c5efc9cb52d47bb056a811eb1bf2b58fc33..5a43afc0a89d0cdcbfec7f651c16c4a80af8ce66 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -22,7 +22,7 @@ from fba import network
 from fba.models import instances
 
 def fetch_peers(domain: str) -> list:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software='lemmy' - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}',software='lemmy' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":

diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py
index bf5892488cc53d3534f886e477bb32afe5bc2954..3fd1c5a683207f836aa4b92870d299702447dcf9 100644 (file)
--- a/fba/networks/misskey.py
+++ b/fba/networks/misskey.py
@@ -27,7 +27,7 @@ from fba.helpers import tidyup
 from fba.models import instances
 
 def fetch_peers(domain: str) -> list:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -130,7 +130,7 @@ def fetch_blocks(domain: str) -> dict:
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
 
-    # DEBUG: print(f"DEBUG: Fetching misskey blocks from domain={domain}")
+    # DEBUG: print(f"DEBUG: Fetching misskey blocks from domain='{domain}'")
     blocklist = {
         "suspended": [],
         "blocked"  : []

diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py
index 26be23288c1789e1c27f8af03cfbafae75d58d50..f63064283a2625052d1891ebe08c2e014b9cc9f1 100644 (file)
--- a/fba/networks/peertube.py
+++ b/fba/networks/peertube.py
@@ -21,7 +21,7 @@ from fba import network
 from fba.models import instances
 
 def fetch_peers(domain: str) -> list:
-    # DEBUG: print(f"DEBUG: domain({len(domain)})={domain},software='peertube' - CALLED!")
+    # DEBUG: print(f"DEBUG: domain({len(domain)})='{domain}',software='peertube' - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":