Merge loggers

diff --git a/src/documents/parsers.py b/src/documents/parsers.py
index 33917d21ab44bbafcc7b1d545fc5022dfe042243..a3ff44bab6910efc8f6f8853ca449c4386f7b212 100644 (file)
--- 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 ddeda73672428ba8b135e14dcae977934f7c2164..45c08196ace9b918c21ce871191d9c851647d57c 100644 (file)
--- 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 cb5bec64fbeb441728ccab5ef574a6ad6c00cf9d..be135429091d1df2dda7588e8b04a53661719a44 100644 (file)
--- 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 d33f80c72b6402fed08a42d9fd4355d2784131d8..f7b04489d20a92374c3a20b1c7963a9c169079ab 100644 (file)
--- 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):