diff --git a/pkgs/clan-cli/clan_cli/config/__init__.py b/pkgs/clan-cli/clan_cli/config/__init__.py index ff2b9c63d..fbfad5163 100644 --- a/pkgs/clan-cli/clan_cli/config/__init__.py +++ b/pkgs/clan-cli/clan_cli/config/__init__.py @@ -180,9 +180,9 @@ def process_args( def register_parser( parser: argparse.ArgumentParser, - optionsFile: Optional[Union[str, Path]] = os.environ.get("CLAN_OPTIONS_FILE"), + options_file: Optional[Union[str, Path]] = os.environ.get("CLAN_OPTIONS_FILE"), ) -> None: - if not optionsFile: + if not options_file: # use nix eval to evaluate .#clanOptions # this will give us the evaluated config with the options attribute proc = subprocess.run( @@ -200,7 +200,7 @@ def register_parser( with open(file) as f: options = json.load(f) else: - with open(optionsFile) as f: + with open(options_file) as f: options = json.load(f) return _register_parser(parser, options) diff --git a/pkgs/clan-cli/clan_cli/ssh/__init__.py b/pkgs/clan-cli/clan_cli/ssh/__init__.py index 05ae92771..5f1f8feeb 100644 --- a/pkgs/clan-cli/clan_cli/ssh/__init__.py +++ b/pkgs/clan-cli/clan_cli/ssh/__init__.py @@ -50,7 +50,7 @@ class CommandFormatter(logging.Formatter): self.hostnames: List[str] = [] self.hostname_color_offset = 1 # first host shouldn't get agressive red - def formatMessage(self, record: logging.LogRecord) -> str: + def format(self, record: logging.LogRecord) -> str: colorcode = 0 if record.levelno == logging.ERROR: colorcode = 31 # red @@ -68,7 +68,7 @@ class CommandFormatter(logging.Formatter): setattr(record, "prefix_color", prefix_color) setattr(record, "color_reset", color_reset) - return super().formatMessage(record) + return super().format(record) def hostname_colorcode(self, hostname: str) -> int: try: diff --git a/pkgs/clan-cli/clan_cli/ssh/cli.py b/pkgs/clan-cli/clan_cli/ssh/cli.py index f7966d083..da3d6bc54 100644 --- a/pkgs/clan-cli/clan_cli/ssh/cli.py +++ b/pkgs/clan-cli/clan_cli/ssh/cli.py @@ -33,7 +33,7 @@ def ssh( subprocess.run(cmd) -def qrcode_scan(pictureFile: str) -> str: +def qrcode_scan(picture_file: str) -> str: return ( subprocess.run( nix_shell( @@ -42,7 +42,7 @@ def qrcode_scan(pictureFile: str) -> str: "zbarimg", "--quiet", "--raw", - pictureFile, + picture_file, ], ), stdout=subprocess.PIPE, diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml index c6f98573f..127d6cfc6 100644 --- a/pkgs/clan-cli/pyproject.toml +++ b/pkgs/clan-cli/pyproject.toml @@ -46,7 +46,7 @@ ignore_missing_imports = true [tool.ruff] line-length = 88 -select = [ "E", "F", "I", "U"] +select = [ "E", "F", "I", "U", "N"] ignore = [ "E501" ] [tool.black]