cleanup ruff rule errors in the code

Author: mboot-github

Makefile

@@ -4,7 +4,7 @@ include Makefile.inc
 
 MYPY_INSTALL := \
 	types-requests \
-	types-python-dateutil
+	types-python-dateutil redis
 
 prep: clean format check mypy
 

pyproject.toml

@@ -158,20 +158,17 @@
     ignore = [
         # ignore for now:
         "ARG002","ARG001",
-        "COM812",
         "D107","D102","D101","D103","D100","D105","D104","D205","D203",
-        "FBT002","FBT001",
-        "FIX004",
         "N812","N818","N806","N802","N815","N816","N803","N999",
-        "PIE810",
         "PLR6201","PLR2004","PLR0917","PLR0913","PLR0911","PLR0912","PLR0914",
-        "PLW0603","PLW0602", "PLW2901",
+        "PLW0603", # Using the global statement to update `xxx` is discouraged
+        "PLW0602", # Using global for `xxx` but no assignment is done
         "RUF001","RUF067", "RUF012",
         "S101","S602",
 
         #
+        "COM812", # The following rule may cause conflicts when used with the formatter: `COM812`
         "T201",   # print statements are ok, used in verbose mode
-        "FIX002",  # TODOs need some love but we will probably not get of them
         "D212",   # `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible.
         "PT028",  # experimental rule, incomplete
     ]

whoisdomain/__init__.py

@@ -126,7 +126,9 @@
 ]
 
 
-def _result2dict(func: Any) -> Any:
+def _result2dict(
+    func: Any,
+) -> Any:
     @wraps(func)
     def _inner(*args: str, **kw: Any) -> dict[str, Any]:
         r = func(*args, **kw)
@@ -138,6 +140,7 @@ def _inner(*args: str, **kw: Any) -> dict[str, Any]:
 def remoteQ2(
     conn: Any,
     max_requests: int,
+    *,
     verbose: bool = False,
 ) -> None:
     n: int = 0
@@ -249,6 +252,7 @@ def q2(
 
 def query(
     domain: str,
+    *,
     force: bool = False,
     cache_file: str | None = None,
     cache_age: int = 60 * 60 * 48,

whoisdomain/cache/dbmCache.py

@@ -10,6 +10,7 @@ class DBMCache:
     def __init__(
         self,
         dbmFile: str,
+        *,
         verbose: bool = False,
     ) -> None:
         self.verbose = verbose

whoisdomain/cache/dummyCache.py

@@ -8,6 +8,7 @@
 class DummyCache:
     def __init__(
         self,
+        *,
         verbose: bool = False,
     ) -> None:
         self.verbose = verbose

whoisdomain/cache/redisCache.py

@@ -15,7 +15,14 @@
 if HAS_REDIS:
 
     class RedisCache:
-        def __init__(self, verbose: bool = False, host: str = "localhost", port: int = 6379, db: int = 0) -> None:
+        def __init__(
+            self,
+            *,
+            verbose: bool = False,
+            host: str = "localhost",
+            port: int = 6379,
+            db: int = 0,
+        ) -> None:
             self.verbose = verbose
 
             self.pool = redis.ConnectionPool(host=host, port=port, db=db, decode_responses=True)

whoisdomain/cache/simpleCacheBase.py

@@ -9,6 +9,7 @@
 class SimpleCacheBase:
     def __init__(
         self,
+        *,
         verbose: bool = False,
         cacheMaxAge: int = (60 * 60 * 48),
     ) -> None:

whoisdomain/cache/simpleCacheWithFile.py

@@ -16,6 +16,7 @@ class SimpleCacheWithFile(SimpleCacheBase):
 
     def __init__(
         self,
+        *,
         verbose: bool = False,
         cacheFilePath: str | None = None,
         cacheMaxAge: int = (60 * 60 * 48),

whoisdomain/context/dataContext.py

@@ -12,6 +12,7 @@ class DataContext:
     def __init__(
         self,
         domain: str,
+        *,
         hasLibTld: bool = False,
     ) -> None:
         self.originalDomain: str = domain  # the requested domain before cleanup

whoisdomain/doWhoisCommand.py

@@ -76,7 +76,7 @@ def doWhoisAndReturnString(
         cache.put(
             keyString,
             wci.executeWhoisQueryOrReturnFileData(),
-        )
+        ),
     )