diff --git a/pyproject.toml b/pyproject.toml index c24bd9f82..4fa606afc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -226,11 +226,7 @@ extend-select = [ "FBT", # https://docs.astral.sh/ruff/rules/#flake8-boolean-trap-fbt "FLY", # https://docs.astral.sh/ruff/rules/#flynt-fly "FURB", # https://docs.astral.sh/ruff/rules/#refurb-furb - "G", - "G010", # https://docs.astral.sh/ruff/rules/#flake8-logging-format-g - "G101", - "G201", - "G202", + "G", # https://docs.astral.sh/ruff/rules/#flake8-logging-format-g "I", # https://docs.astral.sh/ruff/rules/#isort-i "ICN", # https://docs.astral.sh/ruff/rules/#flake8-import-conventions-icn "INP", # https://docs.astral.sh/ruff/rules/#flake8-no-pep420-inp @@ -297,6 +293,7 @@ ignore = [ "PLC0415", "RUF012", "SIM105", + "G004", # Logging statement uses f-string - good to do, but a large diff ] # Migrations per-file-ignores."*/migrations/*.py" = [ diff --git a/src/documents/parsers.py b/src/documents/parsers.py index eda2e7bd3..70e54eb1f 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -110,7 +110,7 @@ def run_convert( args += ["-define", "pdf:use-cropbox=true"] if use_cropbox else [] args += [str(input_file), str(output_file)] - logger.debug("Execute: " + " ".join(args), extra={"group": logging_group}) + logger.debug("Execute: %s", " ".join(args), extra={"group": logging_group}) try: run_subprocess(args, environment, logger) diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index 2a86f1973..add0fe21e 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -766,8 +766,8 @@ class MailAccountHandler(LoggingMixin): self.log.info(f"Located folder: {folder_info.name}") except Exception as e: self.log.error( - "Exception during folder listing, unable to provide list folders: " - + str(e), + "Exception during folder listing, unable to provide list folders: %s", + str(e), ) raise MailError(