disallow variable shadowing

pkgs/clan-cli/tests/sshd.py

@@ -38,14 +38,14 @@ def sshd_config(test_root: Path) -> Iterator[SshdConfig]:
     # FIXME, if any parent of the sshd directory is world-writable than sshd will refuse it.
     # we use .direnv instead since it's already in .gitignore
     with TemporaryDirectory() as _dir:
-        dir = Path(_dir)
+        tmpdir = Path(_dir)
         host_key = test_root / "data" / "ssh_host_ed25519_key"
         host_key.chmod(0o600)
         template = (test_root / "data" / "sshd_config").read_text()
         content = string.Template(template).substitute(dict(host_key=host_key))
-        config = dir / "sshd_config"
+        config = tmpdir / "sshd_config"
         config.write_text(content)
-        login_shell = dir / "shell"
+        login_shell = tmpdir / "shell"
 
         bash = shutil.which("bash")
         path = os.environ["PATH"]
@@ -72,7 +72,7 @@ exec {bash} -l "${{@}}"
         ), "we do not support the ld_preload trick on non-linux just now"
 
         # This enforces a login shell by overriding the login shell of `getpwnam(3)`
-        lib_path = dir / "libgetpwnam-preload.so"
+        lib_path = tmpdir / "libgetpwnam-preload.so"
         subprocess.run(
             [
                 os.environ.get("CC", "cc"),

pkgs/clan-cli/tests/test_config.py

@@ -1,7 +1,7 @@
 import json
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from cli import Cli
@@ -211,13 +211,16 @@ def test_map_type() -> None:
 
 # test the cast function with simple types
 def test_cast() -> None:
-    assert config.cast(value=["true"], type=bool, opt_description="foo-option") is True
     assert (
-        config.cast(value=["null"], type=Optional[str], opt_description="foo-option")  # noqa: UP007
+        config.cast(value=["true"], input_type=bool, opt_description="foo-option")
+        is True
+    )
+    assert (
+        config.cast(value=["null"], input_type=str | None, opt_description="foo-option")
         is None
     )
     assert (
-        config.cast(value=["bar"], type=Optional[str], opt_description="foo-option")  # noqa: UP007
+        config.cast(value=["bar"], input_type=str | None, opt_description="foo-option")
         == "bar"
     )