From 6ff28c92a483016a7fcd4c718f7367a83a49ab89 Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:41:40 -0800 Subject: [PATCH] Resolves minor flake8 warnings in the test suite --- src/documents/tests/test_admin.py | 2 -- src/documents/tests/test_api.py | 11 +++++------ src/documents/tests/test_barcodes.py | 2 +- src/documents/tests/test_checks.py | 1 - src/documents/tests/test_consumer.py | 1 - src/documents/tests/test_date_parsing.py | 1 - src/documents/tests/test_management.py | 6 +++--- src/documents/tests/test_management_thumbnails.py | 3 --- src/documents/tests/test_migration_webp_conversion.py | 1 - src/paperless_mail/tests/test_mail.py | 6 +++--- src/paperless_mail/tests/test_parsers_live.py | 1 - src/paperless_tika/tests/test_live_tika.py | 1 - 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.py index edbeb6f4c..7a39c95be 100644 --- a/src/documents/tests/test_admin.py +++ b/src/documents/tests/test_admin.py @@ -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 diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 55a176247..dace48578 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -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") diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py index ef086626d..0c4660fed 100644 --- a/src/documents/tests/test_barcodes.py +++ b/src/documents/tests/test_barcodes.py @@ -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!", ], ) diff --git a/src/documents/tests/test_checks.py b/src/documents/tests/test_checks.py index ec610b896..a331572da 100644 --- a/src/documents/tests/test_checks.py +++ b/src/documents/tests/test_checks.py @@ -1,5 +1,4 @@ import textwrap -import unittest from unittest import mock from django.core.checks import Error diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index f6685ad02..dc86de331 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -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 diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py index b9151a6f7..30466a83f 100644 --- a/src/documents/tests/test_date_parsing.py +++ b/src/documents/tests/test_date_parsing.py @@ -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): diff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.py index fe217676b..2844a0a30 100644 --- a/src/documents/tests/test_management.py +++ b/src/documents/tests/test_management.py @@ -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"), ) diff --git a/src/documents/tests/test_management_thumbnails.py b/src/documents/tests/test_management_thumbnails.py index 0e643c354..48821725b 100644 --- a/src/documents/tests/test_management_thumbnails.py +++ b/src/documents/tests/test_management_thumbnails.py @@ -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 diff --git a/src/documents/tests/test_migration_webp_conversion.py b/src/documents/tests/test_migration_webp_conversion.py index a3a5fa6bc..9631c5704 100644 --- a/src/documents/tests/test_migration_webp_conversion.py +++ b/src/documents/tests/test_migration_webp_conversion.py @@ -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 diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 28d40be7c..3a17d7ab3 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -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 diff --git a/src/paperless_mail/tests/test_parsers_live.py b/src/paperless_mail/tests/test_parsers_live.py index 264f99316..7ea56d7e4 100644 --- a/src/paperless_mail/tests/test_parsers_live.py +++ b/src/paperless_mail/tests/test_parsers_live.py @@ -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 diff --git a/src/paperless_tika/tests/test_live_tika.py b/src/paperless_tika/tests/test_live_tika.py index b5efc7cef..60c2b96a4 100644 --- a/src/paperless_tika/tests/test_live_tika.py +++ b/src/paperless_tika/tests/test_live_tika.py @@ -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