Merge double sided

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

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(