From cb429f9c3f7d8aaaed65d0f1a01c16565d463870 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:30:50 -0700 Subject: [PATCH] Merge loggers --- src/documents/parsers.py | 2 +- src/paperless/consumer.py | 2 +- src/{documents => paperless}/loggers.py | 0 src/paperless_mail/mail.py | 2 +- src/paperless_mail/preprocessor.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{documents => paperless}/loggers.py (100%) diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 33917d21a..a3ff44bab 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -15,8 +15,8 @@ from typing import TYPE_CHECKING from django.conf import settings from django.utils import timezone -from documents.loggers import LoggingMixin from documents.signals import document_consumer_declaration +from paperless.loggers import LoggingMixin from paperless.utils import copy_file_with_basic_stats from paperless.utils import run_subprocess diff --git a/src/paperless/consumer.py b/src/paperless/consumer.py index ddeda7367..45c08196a 100644 --- a/src/paperless/consumer.py +++ b/src/paperless/consumer.py @@ -18,7 +18,6 @@ from rest_framework.reverse import reverse from documents.classifier import load_classifier from documents.file_handling import create_source_path_directory from documents.file_handling import generate_unique_filename -from documents.loggers import LoggingMixin from documents.parsers import DocumentParser from documents.parsers import ParseError from documents.parsers import get_parser_class_for_mime_type @@ -36,6 +35,7 @@ from documents.signals.handlers import run_workflows from documents.templating.workflows import parse_w_workflow_placeholders from paperless.data_models import ConsumableDocument from paperless.data_models import DocumentMetadataOverrides +from paperless.loggers import LoggingMixin from paperless.models import Correspondent from paperless.models import CustomField from paperless.models import CustomFieldInstance diff --git a/src/documents/loggers.py b/src/paperless/loggers.py similarity index 100% rename from src/documents/loggers.py rename to src/paperless/loggers.py diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index cb5bec64f..be1354290 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -33,12 +33,12 @@ from imap_tools import errors from imap_tools.mailbox import MailBoxTls from imap_tools.query import LogicOperator -from documents.loggers import LoggingMixin from documents.parsers import is_mime_type_supported from documents.tasks import consume_file from paperless.data_models import ConsumableDocument from paperless.data_models import DocumentMetadataOverrides from paperless.data_models import DocumentSource +from paperless.loggers import LoggingMixin from paperless.models import Correspondent from paperless_mail.models import MailAccount from paperless_mail.models import MailRule diff --git a/src/paperless_mail/preprocessor.py b/src/paperless_mail/preprocessor.py index d33f80c72..f7b04489d 100644 --- a/src/paperless_mail/preprocessor.py +++ b/src/paperless_mail/preprocessor.py @@ -8,7 +8,7 @@ from django.conf import settings from gnupg import GPG from imap_tools import MailMessage -from documents.loggers import LoggingMixin +from paperless.loggers import LoggingMixin class MailMessagePreprocessor(abc.ABC):