Merge double sided

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index 0380eb59d68e310e904d1f1035173d108df8bb66..a007cc39781cf76a1b39428b63b0f43445042714 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -24,7 +24,6 @@ from documents.barcodes import BarcodePlugin
 from documents.caching import clear_document_caches
 from documents.classifier import DocumentClassifier
 from documents.classifier import load_classifier
-from documents.double_sided import CollatePlugin
 from documents.file_handling import create_source_path_directory
 from documents.file_handling import generate_unique_filename
 from documents.parsers import DocumentParser
@@ -42,6 +41,7 @@ from paperless.consumer import ConsumerPlugin
 from paperless.consumer import WorkflowTriggerPlugin
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
+from paperless.double_sided import CollatePlugin
 from paperless.models import Correspondent
 from paperless.models import CustomFieldInstance
 from paperless.models import Document

diff --git a/src/documents/tests/test_double_sided.py b/src/documents/tests/test_double_sided.py
index dad2385e33e1817184c3a880e80533fe10364f52..03d044b242e03b61ea695dce89a57d358c22f54a 100644 (file)
--- a/src/documents/tests/test_double_sided.py
+++ b/src/documents/tests/test_double_sided.py
@@ -10,14 +10,14 @@ from pdfminer.high_level import extract_text
 from pikepdf import Pdf
 
 from documents import tasks
-from documents.double_sided import STAGING_FILE_NAME
-from documents.double_sided import TIMEOUT_MINUTES
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DummyProgressManager
 from documents.tests.utils import FileSystemAssertsMixin
 from paperless.consumer import ConsumerError
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentSource
+from paperless.double_sided import STAGING_FILE_NAME
+from paperless.double_sided import TIMEOUT_MINUTES
 
 
 @override_settings(

diff --git a/src/documents/double_sided.py b/src/paperless/double_sided.py
similarity index 100%
rename from src/documents/double_sided.py
rename to src/paperless/double_sided.py