]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Resolves minor flake8 warnings in the test suite
authorTrenton H <797416+stumpylog@users.noreply.github.com>
Wed, 4 Jan 2023 18:41:40 +0000 (10:41 -0800)
committerTrenton H <797416+stumpylog@users.noreply.github.com>
Thu, 5 Jan 2023 16:39:48 +0000 (08:39 -0800)
12 files changed:
src/documents/tests/test_admin.py
src/documents/tests/test_api.py
src/documents/tests/test_barcodes.py
src/documents/tests/test_checks.py
src/documents/tests/test_consumer.py
src/documents/tests/test_date_parsing.py
src/documents/tests/test_management.py
src/documents/tests/test_management_thumbnails.py
src/documents/tests/test_migration_webp_conversion.py
src/paperless_mail/tests/test_mail.py
src/paperless_mail/tests/test_parsers_live.py
src/paperless_tika/tests/test_live_tika.py

index edbeb6f4c2ccc92563d721478f573d265692621a..7a39c95bedda12bbef69639d5b4a52fcf953c18a 100644 (file)
@@ -1,5 +1,3 @@
-from unittest import mock
-
 from django.contrib.admin.sites import AdminSite
 from django.test import TestCase
 from django.utils import timezone
index 55a17624704061afee42458cb683095a1c217e73..dace4857888455403005e68de86bb05a2d7ccd7d 100644 (file)
@@ -33,7 +33,6 @@ from documents.models import SavedView
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.models import Comment
-from documents.models import StoragePath
 from documents.tests.utils import DirectoriesMixin
 from paperless import version
 from rest_framework.test import APITestCase
@@ -480,7 +479,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
                 self.assertNotIn(result["id"], seen_ids)
                 seen_ids.append(result["id"])
 
-        response = self.client.get(f"/api/documents/?query=content&page=6&page_size=10")
+        response = self.client.get("/api/documents/?query=content&page=6&page_size=10")
         results = response.data["results"]
         self.assertEqual(response.data["count"], 55)
         self.assertEqual(len(results), 5)
@@ -500,9 +499,9 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
                 )
                 index.update_document(writer, doc)
 
-        response = self.client.get(f"/api/documents/?query=content&page=0&page_size=10")
+        response = self.client.get("/api/documents/?query=content&page=0&page_size=10")
         self.assertEqual(response.status_code, 404)
-        response = self.client.get(f"/api/documents/?query=content&page=3&page_size=10")
+        response = self.client.get("/api/documents/?query=content&page=3&page_size=10")
         self.assertEqual(response.status_code, 404)
 
     @mock.patch("documents.index.autocomplete")
@@ -1080,7 +1079,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         self.assertEqual(meta["archive_size"], os.stat(archive_file).st_size)
 
     def test_get_metadata_invalid_doc(self):
-        response = self.client.get(f"/api/documents/34576/metadata/")
+        response = self.client.get("/api/documents/34576/metadata/")
         self.assertEqual(response.status_code, 404)
 
     def test_get_metadata_no_archive(self):
@@ -1145,7 +1144,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         )
 
     def test_get_suggestions_invalid_doc(self):
-        response = self.client.get(f"/api/documents/34676/suggestions/")
+        response = self.client.get("/api/documents/34676/suggestions/")
         self.assertEqual(response.status_code, 404)
 
     @mock.patch("documents.views.match_storage_paths")
index ef086626d67c5732f85c3cbd8eb79966e2ddcc83..0c4660fed1152d9d534a1a9580030abb969955e4 100644 (file)
@@ -401,7 +401,7 @@ class TestBarcode(DirectoriesMixin, TestCase):
             self.assertEqual(
                 cm.output,
                 [
-                    f"WARNING:paperless.barcodes:No pages to split on!",
+                    "WARNING:paperless.barcodes:No pages to split on!",
                 ],
             )
 
index ec610b8964a467c9965a473551ccafb854fe7075..a331572da8444bb16c36247f0a5ca8b04c3581d1 100644 (file)
@@ -1,5 +1,4 @@
 import textwrap
-import unittest
 from unittest import mock
 
 from django.core.checks import Error
index f6685ad02016ceee87cd9c6f1b4b4925a25517fa..dc86de3316e38638a18420f664ffd1500fa8ede2 100644 (file)
@@ -4,7 +4,6 @@ import re
 import shutil
 import stat
 import tempfile
-from subprocess import CalledProcessError
 from unittest import mock
 from unittest.mock import MagicMock
 
index b9151a6f7b6f3fa736029f2e138cf0b777527f01..30466a83f05df6f47fdf7f67254f3f04b756d808 100644 (file)
@@ -9,7 +9,6 @@ from django.test import override_settings
 from django.test import TestCase
 from documents.parsers import parse_date
 from documents.parsers import parse_date_generator
-from paperless.settings import DATE_ORDER
 
 
 class TestDate(TestCase):
index fe217676b182799edd0e19318081e6535ee9e4ac..2844a0a30a3236619aabc19a4e1a09ad402e9e8d 100644 (file)
@@ -88,10 +88,10 @@ class TestArchiver(DirectoriesMixin, TestCase):
             mime_type="application/pdf",
             filename="document_01.pdf",
         )
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document.pdf"))
+        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "document.pdf"))
         shutil.copy(
             sample_file,
-            os.path.join(self.dirs.originals_dir, f"document_01.pdf"),
+            os.path.join(self.dirs.originals_dir, "document_01.pdf"),
         )
 
         update_document_archive_file(doc2.pk)
@@ -150,7 +150,7 @@ class TestDecryptDocuments(TestCase):
                 "samples",
                 "documents",
                 "thumbnails",
-                f"0000004.webp.gpg",
+                "0000004.webp.gpg",
             ),
             os.path.join(thumb_dir, f"{doc.id:07}.webp.gpg"),
         )
index 0e643c354247b59db640829e9e772426e4f77d85..48821725b19397ec1ca6d9655b26248b30053502 100644 (file)
@@ -5,10 +5,7 @@ from unittest import mock
 from django.core.management import call_command
 from django.test import TestCase
 from documents.management.commands.document_thumbnails import _process_document
-from documents.models import Correspondent
 from documents.models import Document
-from documents.models import DocumentType
-from documents.models import Tag
 from documents.tests.utils import DirectoriesMixin
 
 
index a3a5fa6bceffc53f7e83c875b16f231f60c2755b..9631c5704f211242c1084c65f31973c0c5a919a3 100644 (file)
@@ -7,7 +7,6 @@ from typing import Union
 from unittest import mock
 
 from django.test import override_settings
-from documents.tests.test_migration_archive_files import thumbnail_path
 from documents.tests.utils import TestMigrations
 
 
index 28d40be7c470fd92e60d22b1da32f0353f804ac8..3a17d7ab3d67abef62660d1df58d0cd70816c21e 100644 (file)
@@ -69,7 +69,7 @@ class BogusClient:
                 if message.uid == args[0]:
                     flag = args[2]
                     if flag == "processed":
-                        message._raw_flag_data.append(f"+FLAGS (processed)".encode())
+                        message._raw_flag_data.append(b"+FLAGS (processed)")
                         MailMessage.flags.fget.cache_clear()
 
 
@@ -153,7 +153,7 @@ class BogusMailBox(ContextManager):
                     if flag == MailMessageFlags.SEEN:
                         message.seen = value
                     if flag == "processed":
-                        message._raw_flag_data.append(f"+FLAGS (processed)".encode())
+                        message._raw_flag_data.append(b"+FLAGS (processed)")
                         MailMessage.flags.fget.cache_clear()
 
     def move(self, uid_list, folder):
@@ -223,7 +223,7 @@ def create_message(
     imap_msg.seen = seen
     imap_msg.flagged = flagged
     if processed:
-        imap_msg._raw_flag_data.append(f"+FLAGS (processed)".encode())
+        imap_msg._raw_flag_data.append(b"+FLAGS (processed)")
         MailMessage.flags.fget.cache_clear()
 
     return imap_msg
index 264f99316710a77ce060280c452e73ec182e1b89..7ea56d7e4fa90aa4dd3ebd40e5a1d2ebe9615e0b 100644 (file)
@@ -6,7 +6,6 @@ from urllib.request import urlopen
 
 import pytest
 from django.test import TestCase
-from documents.parsers import ParseError
 from documents.parsers import run_convert
 from imagehash import average_hash
 from paperless_mail.parsers import MailDocumentParser
index b5efc7cefbc41ebc3c547e2b535ebd9f55de5ee5..60c2b96a40378b62564aec3054ffbebaf4565db1 100644 (file)
@@ -5,7 +5,6 @@ from typing import Final
 
 import pytest
 from django.test import TestCase
-from documents.parsers import ParseError
 from paperless_tika.parsers import TikaDocumentParser