lint clean again

Author: mboot-github

pyproject.toml

@@ -160,11 +160,18 @@
         "ARG002","ARG001",
         "D107","D102","D101","D103","D100","D105","D104","D205","D203",
         "N812","N818","N806","N802","N815","N816","N803","N999",
-        "PLR6201","PLR2004","PLR0917","PLR0913","PLR0911","PLR0912","PLR0914",
+        "PLR2004",
+
+        "PLR0911", # Too many return statements
+        "PLR0912", # Too many branches
+        "PLR0914", # Too many local variables
+        "PLR0913", # Too many arguments in function definition
         "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",
+        "S101", # Use of `assert` detected
+        # "S602",
 
         #
         "COM812", # The following rule may cause conflicts when used with the formatter: `COM812`

whoisdomain/context/parameterContext.py

@@ -213,12 +213,12 @@ def __init__(
         self._validateAllMandatoryNowKnown(mandatory)
 
     def __getattr__(self, name: str) -> Any:
-        if name in ["params", "value"]:
+        if name in {"params", "value"}:
             return self.name
         return self.get(name)
 
     def __setattr__(self, name: str, value: Any) -> None:
-        if name in ["params", "value"]:
+        if name in {"params", "value"}:
             object.__setattr__(self, name, value)
         else:
             self.set(name, value)

whoisdomain/main.py

@@ -598,65 +598,65 @@ def main() -> None:  # noqa: C901,PLR0915
     fileData: dict[str, Any] = {}
 
     for opt, arg in opts:
-        if opt in ("-S", "SupportedTld"):
+        if opt in {"-S", "SupportedTld"}:
             for tld in sorted(whois.validTlds()):
                 print(tld)
             sys.exit(0)
 
-        if opt in ("-V", "Version"):
+        if opt in {"-V", "Version"}:
             print(whois.getVersion())
             sys.exit(0)
 
         if opt == "-h":
             usage()
             sys.exit(0)
 
-        if opt in ("-a", "--all"):
+        if opt in {"-a", "--all"}:
             TestAllTld = True
 
-        if opt in ("-H", "--having"):
+        if opt in {"-H", "--having"}:
             TestAllTld = True
             allHaving = str(arg)
 
-        if opt in ("-r", "--reg"):
+        if opt in {"-r", "--reg"}:
             TestAllTld = True
             allRegex = str(arg)
 
-        if opt in ("-v", "--verbose"):
+        if opt in {"-v", "--verbose"}:
             Verbose = True
             logging.basicConfig(level="DEBUG")
 
-        if opt in ("-p", "--print"):
+        if opt in {"-p", "--print"}:
             PrintGetRawWhoisResult = True
 
-        if opt in ("-j", "--json"):
+        if opt in {"-j", "--json"}:
             PrintJson = True
 
-        if opt in ("-T", "--Testing"):
+        if opt in {"-T", "--Testing"}:
             # print out all names of tld where we have _test
             TestAllTld = True
             rr = makeTestAllCurrentTld(None)
             for item in sorted(rr):
                 print(item)
             sys.exit(0)
 
-        if opt in ("-t", "--test"):
+        if opt in {"-t", "--test"}:
             # collect all _test entries defined and only run those,
             # o not run the default meta.tld
             TestAllTld = True
             TestRunOnly = True
 
-        if opt in ("-R", "--Ruleset"):
+        if opt in {"-R", "--Ruleset"}:
             Ruleset = True
 
-        if opt in ("-D", "--Directory"):
+        if opt in {"-D", "--Directory"}:
             directory = arg
             isDir = pathlib.Path(directory).is_dir()
             if isDir is False:
                 print(f"{directory} cannot be found or is not a directory", file=sys.stderr)
                 sys.exit(101)
 
-        if opt in ("-C", "--Cleanup"):
+        if opt in {"-C", "--Cleanup"}:
             inFile = arg
             isFile = pathlib.Path(arg).is_file()
             if isFile is False:
@@ -668,7 +668,7 @@ def main() -> None:  # noqa: C901,PLR0915
             rc.printMe()
             sys.exit(0)
 
-        if opt in ("-f", "--file"):
+        if opt in {"-f", "--file"}:  # a set
             filename = arg
             isFile = pathlib.Path(filename).is_file()
             if isFile is False:
@@ -679,7 +679,7 @@ def main() -> None:  # noqa: C901,PLR0915
                 files.append(filename)
                 TestAllTld = False
 
-        if opt in ("-d", "--domain"):
+        if opt in {"-d", "--domain"}:  # set
             domain = arg
             if domain not in domains:
                 domains.append(domain)

whoisdomain/whoisCliInterface.py

@@ -43,7 +43,7 @@ def _tryInstallMissingWhoisOnWindows(cls) -> None:
         msg = f"downloading dependencies: {copy_command}"
         log.debug(msg)
 
-        subprocess.call(
+        subprocess.call(  # noqa: S602 # `subprocess` call with `shell=True` identified, security issue
             copy_command,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
@@ -100,7 +100,7 @@ def _postProcessingResult(self) -> str:
         msg = f"{self.rawWhoisResultString}"
         log.debug(msg)
 
-        if self.pc.ignore_returncode is False and self.processHandle.returncode not in [0, 1]:
+        if self.pc.ignore_returncode is False and self.processHandle.returncode not in {0, 1}:
             if "fgets: Connection reset by peer" in self.rawWhoisResultString:
                 return self.rawWhoisResultString.replace("fgets: Connection reset by peer", "")