From 727f86c36977e2c2353c126584c95cb70ba64dbb Mon Sep 17 00:00:00 2001 From: Jonas Winkler Date: Wed, 18 Nov 2020 22:41:14 +0100 Subject: [PATCH] codestyle --- src/documents/consumer.py | 1 - src/documents/file_handling.py | 2 +- src/documents/migrations/1000_update_paperless_all.py | 3 --- src/documents/tests/test_api.py | 3 +-- src/documents/tests/test_classifier.py | 6 +++--- src/documents/tests/test_consumer.py | 6 ++---- src/paperless_mail/management/commands/mail_fetcher.py | 2 +- src/paperless_mail/tasks.py | 1 - src/paperless_mail/views.py | 3 --- 9 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 src/paperless_mail/views.py diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 913f324c7..3cd57796e 100755 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -3,7 +3,6 @@ import hashlib import logging import os import re -import uuid from django.conf import settings from django.db import transaction diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index ce51afe81..024003118 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -86,7 +86,7 @@ def generate_filename(document): added_day=document.added.day if document.added else "none", tags=tags, ) - except (ValueError, KeyError, IndexError) as e: + except (ValueError, KeyError, IndexError): logging.getLogger(__name__).warning("Invalid PAPERLESS_FILENAME_FORMAT: {}, falling back to default,".format(settings.PAPERLESS_FILENAME_FORMAT)) # Always append the primary key to guarantee uniqueness of filename diff --git a/src/documents/migrations/1000_update_paperless_all.py b/src/documents/migrations/1000_update_paperless_all.py index 8c1bd52af..5e5b475a3 100644 --- a/src/documents/migrations/1000_update_paperless_all.py +++ b/src/documents/migrations/1000_update_paperless_all.py @@ -1,7 +1,4 @@ # Generated by Django 3.1.3 on 2020-11-07 12:35 -import os - -from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 1cc142e81..a049fb825 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -2,11 +2,10 @@ import os import shutil import tempfile from unittest import mock -from unittest.mock import MagicMock from django.contrib.auth.models import User from django.test import override_settings -from rest_framework.test import APITestCase, APIClient +from rest_framework.test import APITestCase from documents.models import Document, Correspondent, DocumentType, Tag diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.py index 9c85b786a..4ae672ac2 100644 --- a/src/documents/tests/test_classifier.py +++ b/src/documents/tests/test_classifier.py @@ -80,6 +80,6 @@ class TestClassifier(TestCase): self.classifier.save_classifier() - newClassifier = DocumentClassifier() - newClassifier.reload() - self.assertFalse(newClassifier.train()) + new_classifier = DocumentClassifier() + new_classifier.reload() + self.assertFalse(new_classifier.train()) diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index 52cf7dcc6..f61fd5718 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -5,8 +5,6 @@ import tempfile from unittest import mock from unittest.mock import MagicMock -from django.conf import settings -from django.db import DatabaseError from django.test import TestCase, override_settings from ..consumer import Consumer, ConsumerError @@ -504,9 +502,9 @@ class TestConsumer(TestCase): def testOverrideFilename(self): filename = self.get_test_file() - overrideFilename = "My Bank - Statement for November.pdf" + override_filename = "My Bank - Statement for November.pdf" - document = self.consumer.try_consume_file(filename, override_filename=overrideFilename) + document = self.consumer.try_consume_file(filename, override_filename=override_filename) self.assertEqual(document.correspondent.name, "My Bank") self.assertEqual(document.title, "Statement for November") diff --git a/src/paperless_mail/management/commands/mail_fetcher.py b/src/paperless_mail/management/commands/mail_fetcher.py index 928d177ef..b11b5b70d 100644 --- a/src/paperless_mail/management/commands/mail_fetcher.py +++ b/src/paperless_mail/management/commands/mail_fetcher.py @@ -1,6 +1,6 @@ from django.core.management.base import BaseCommand -from paperless_mail import mail, tasks +from paperless_mail import tasks class Command(BaseCommand): diff --git a/src/paperless_mail/tasks.py b/src/paperless_mail/tasks.py index dbef91c94..22d512c1e 100644 --- a/src/paperless_mail/tasks.py +++ b/src/paperless_mail/tasks.py @@ -1,6 +1,5 @@ import logging -from paperless_mail import mail from paperless_mail.mail import MailAccountHandler from paperless_mail.models import MailAccount diff --git a/src/paperless_mail/views.py b/src/paperless_mail/views.py deleted file mode 100644 index 91ea44a21..000000000 --- a/src/paperless_mail/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here.