From bb913af9d86dfbb961b8d86d2365459e108c912b Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 28 Dec 2023 12:37:04 -0800 Subject: [PATCH] Reverts unintentional change --- src/paperless/config.py | 2 +- src/paperless/settings.py | 13 ++----------- src/paperless_tesseract/signals.py | 4 +--- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/paperless/config.py b/src/paperless/config.py index cd55cf420..c5c1b753c 100644 --- a/src/paperless/config.py +++ b/src/paperless/config.py @@ -79,7 +79,7 @@ class OcrConfig(OutputTypeConfig): user_args = None if app_config.user_args: user_args = app_config.user_args - elif settings.OCR_USER_ARGS is not None: + elif settings.OCR_USER_ARGS is not None: # pragma: no cover try: user_args = json.loads(settings.OCR_USER_ARGS) except json.JSONDecodeError: diff --git a/src/paperless/settings.py b/src/paperless/settings.py index b6e679dc7..8185773e7 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -50,15 +50,6 @@ def __get_boolean(key: str, default: str = "NO") -> bool: return bool(os.getenv(key, default).lower() in ("yes", "y", "1", "t", "true")) -def __get_optional_boolean(key: str) -> Optional[bool]: - """ - Returns None if the environment key is not present, otherwise a boolean - """ - if key in os.environ: - return __get_boolean(key) - return None - - def __get_int(key: str, default: int) -> int: """ Return an integer value based on the environment variable or a default @@ -71,7 +62,7 @@ def __get_optional_int(key: str) -> Optional[int]: Returns None if the environment key is not present, otherwise an integer """ if key in os.environ: - return __get_int(key, -1) + return __get_int(key, -1) # pragma: no cover return None @@ -97,7 +88,7 @@ def __get_path( def __get_optional_path(key: str) -> Optional[Path]: """ - Returns None if the environment key is not present, otherwise an integer + Returns None if the environment key is not present, otherwise a fully resolved Path """ if key in os.environ: return __get_path(key, "") diff --git a/src/paperless_tesseract/signals.py b/src/paperless_tesseract/signals.py index dce2bf859..7d6f6902f 100644 --- a/src/paperless_tesseract/signals.py +++ b/src/paperless_tesseract/signals.py @@ -5,10 +5,8 @@ def get_parser(*args, **kwargs): def tesseract_consumer_declaration(sender, **kwargs): - from paperless_tesseract.parsers import RasterisedDocumentParser - return { - "parser": RasterisedDocumentParser, + "parser": get_parser, "weight": 0, "mime_types": { "application/pdf": ".pdf",