Fixed some issues found by pylint:

[fba.git] / fba / blocks.py

diff --git a/fba/blocks.py b/fba/blocks.py
index dac50f22ecb67687bbc434545ffce0e488a065a5..50ceec8156638aed0ee733e936912d67564adf6d 100644 (file)
--- a/fba/blocks.py
+++ b/fba/blocks.py
@@ -23,17 +23,17 @@ from fba import fba
 
 def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
     # DEBUG: print(f"DEBUG: reason='{reason}',blocker={blocker},blocked={blocked},block_level={block_level} - CALLED!")
-    if type(reason) != str and reason != None:
+    if not isinstance(reason, str) and reason is not None:
         raise ValueError(f"Parameter reason[]='{type(reason)}' is not 'str'")
-    elif type(blocker) != str:
+    elif not isinstance(blocker, str):
         raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not 'str'")
     elif blocker == "":
         raise ValueError("Parameter 'blocker' is empty")
-    elif type(blocked) != str:
+    elif not isinstance(blocked, str):
         raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not 'str'")
     elif blocked == "":
         raise ValueError("Parameter 'blocked' is empty")
-    elif type(block_level) != str:
+    elif not isinstance(block_level, str):
         raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
     elif block_level == "":
         raise ValueError("Parameter 'block_level' is empty")
@@ -56,23 +56,23 @@ def update_reason(reason: str, blocker: str, blocked: str, block_level: str):
             # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',reason='{reason}' - EXIT!")
             return
 
-    except BaseException as e:
-        print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
+    except BaseException as exception:
+        print(f"ERROR: failed SQL query: reason='{reason}',blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
 
 def update_last_seen(blocker: str, blocked: str, block_level: str):
     # DEBUG: print("DEBUG: Updating last_seen for:", blocker, blocked, block_level)
-    if type(blocker) != str:
+    if not isinstance(blocker, str):
         raise ValueError(f"Parameter blocker[]='{type(blocker)}' is not 'str'")
     elif blocker == "":
         raise ValueError("Parameter 'blocker' is empty")
-    elif type(blocked) != str:
+    elif not isinstance(blocked, str):
         raise ValueError(f"Parameter blocked[]='{type(blocked)}' is not 'str'")
     elif blocked == "":
         raise ValueError("Parameter 'blocked' is empty")
-    elif type(block_level) != str:
+    elif not isinstance(block_level, str):
         raise ValueError(f"Parameter block_level[]='{type(block_level)}' is not 'str'")
     elif block_level == "":
         raise ValueError("Parameter 'block_level' is empty")
@@ -93,23 +93,23 @@ def update_last_seen(blocker: str, blocked: str, block_level: str):
             # DEBUG: print(f"DEBUG: Did not update any rows: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}' - EXIT!")
             return
 
-    except BaseException as e:
-        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
+    except BaseException as exception:
+        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")
 
 def is_instance_blocked(blocker: str, blocked: str, block_level: str) -> bool:
     # DEBUG: print(f"DEBUG: blocker={blocker},blocked={blocked},block_level={block_level} - CALLED!")
-    if type(blocker) != str:
+    if not isinstance(blocker, str):
         raise ValueError(f"Parameter blocker[]={type(blocker)} is not of type 'str'")
     elif blocker == "":
         raise ValueError("Parameter 'blocker' is empty")
-    elif type(blocked) != str:
+    elif not isinstance(blocked, str):
         raise ValueError(f"Parameter blocked[]={type(blocked)} is not of type 'str'")
     elif blocked == "":
         raise ValueError("Parameter 'blocked' is empty")
-    elif type(block_level) != str:
+    elif not isinstance(block_level, str):
         raise ValueError(f"Parameter block_level[]={type(block_level)} is not of type 'str'")
     elif block_level == "":
         raise ValueError("Parameter 'block_level' is empty")
@@ -123,23 +123,23 @@ def is_instance_blocked(blocker: str, blocked: str, block_level: str) -> bool:
         ),
     )
 
-    is_blocked = fba.cursor.fetchone() != None
+    is_blocked = fba.cursor.fetchone() is not None
 
     # DEBUG: print(f"DEBUG: is_blocked='{is_blocked}' - EXIT!")
     return is_blocked
 
 def add_instance(blocker: str, blocked: str, reason: str, block_level: str):
     # DEBUG: print("DEBUG: blocker,blocked,reason,block_level:", blocker, blocked, reason, block_level)
-    if type(blocker) != str:
+    if not isinstance(blocker, str):
         raise ValueError(f"Parameter blocker[]={type(blocker)} is not 'str'")
     elif blocker == "":
-        raise ValueError(f"Parameter 'blocker' is empty")
+        raise ValueError("Parameter 'blocker' is empty")
     elif not validators.domain(blocker.split("/")[0]):
         raise ValueError(f"Bad blocker='{blocker}'")
-    elif type(blocked) != str:
+    elif not isinstance(blocked, str):
         raise ValueError(f"Parameter blocked[]={type(blocked)} is not 'str'")
     elif blocked == "":
-        raise ValueError(f"Parameter 'blocked' is empty")
+        raise ValueError("Parameter 'blocked' is empty")
     elif not validators.domain(blocked.split("/")[0]):
         raise ValueError(f"Bad blocked='{blocked}'")
     elif blacklist.is_blacklisted(blocker):
@@ -147,7 +147,7 @@ def add_instance(blocker: str, blocked: str, reason: str, block_level: str):
     elif blacklist.is_blacklisted(blocked):
         raise Exception(f"blocked='{blocked}' is blacklisted but function invoked")
 
-    if reason != None:
+    if reason is not None:
         # Maybe needs cleaning
         reason = fba.tidyup_reason(reason)
 
@@ -164,8 +164,8 @@ def add_instance(blocker: str, blocked: str, reason: str, block_level: str):
                  time.time()
              ),
         )
-    except BaseException as e:
-        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',reason='{reason}',block_level='{block_level}',exception[{type(e)}]:'{str(e)}'")
+    except BaseException as exception:
+        print(f"ERROR: failed SQL query: blocker='{blocker}',blocked='{blocked}',reason='{reason}',block_level='{block_level}',exception[{type(exception)}]:'{str(exception)}'")
         sys.exit(255)
 
     # DEBUG: print("DEBUG: EXIT!")