Continued:

[fba.git] / fba / networks / lemmy.py

diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py
index e37c2b800d08a59f6f4685326b522b031522b29a..ebbe9a1bb877d9cd1520307793d4050e8effb0a3 100644 (file)
--- a/fba/networks/lemmy.py
+++ b/fba/networks/lemmy.py
@@ -203,10 +203,7 @@ def fetch_blocks(domain: str) -> list:
                 blocked = tidyup.domain(tag.contents[0]) if tag.contents[0] != "" else None
                 logger.debug("blocked='%s'", blocked)
 
-                if blocked is None:
-                    logger.warning("blocked is empty - SKIPPED!")
-                    continue
-                elif blocked == "":
+                if blocked is None or blocked == "":
                     logger.warning("blocked='%s' is empty after tidyup.domain() - SKIPPED!", tag.contents[0])
                     continue
                 elif not domain_helper.is_wanted(blocked):
@@ -272,11 +269,8 @@ def fetch_instances(domain: str, origin: str) -> list:
                         peer = tidyup.domain(text) if text != "" else None
                         logger.debug("peer='%s' - AFTER", peer)
 
-                        if peer is None:
-                            logger.warning("peer is empty - SKIPPED!")
-                            continue
-                        elif peer == "":
-                            logger.warning("peer is an empty string, text='%s' - SKIPPED!", text)
+                        if peer is None or peer == "":
+                            logger.warning("peer='%s' is empty, text='%s' - SKIPPED!", peer, text)
                             continue
                         elif not domain_helper.is_wanted(peer):
                             logger.debug("peer='%s' is not wanted - SKIPPED!", peer)
@@ -375,11 +369,8 @@ def parse_script(doc: bs4.BeautifulSoup, only: str = None) -> list:
                 peer = tidyup.domain(row["domain"])
                 logger.debug("peer='%s' - AFTER!", peer)
 
-                if peer is None:
-                    logger.warning("peer is empty - SKIPPED!")
-                    continue
-                elif peer == "":
-                    logger.warning("peer is an empty string, row[domain]='%s' - SKIPPED!", row["domain"])
+                if peer is None or peer == "":
+                    logger.warning("peer='%s' is empty, row[domain]='%s' - SKIPPED!", peer, row["domain"])
                     continue
                 elif not domain_helper.is_wanted(peer):
                     logger.debug("peer='%s' is not wanted - SKIPPED!", peer)