From 17803a54aeebc1ead3b58a06f891e51ebf11844c Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 4 May 2020 21:26:45 +0200
Subject: [PATCH] [Reformat] black, isort and superflous imports
---
aleksis/core/apps.py | 3 +--
aleksis/core/mixins.py | 2 ++
aleksis/core/models.py | 11 ++++++-----
aleksis/core/templatetags/html_helpers.py | 1 -
aleksis/core/util/core_helpers.py | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py
index 4f243858d..0037842bc 100644
--- a/aleksis/core/apps.py
+++ b/aleksis/core/apps.py
@@ -2,7 +2,6 @@ from typing import Any, List, Optional, Tuple
import django.apps
from django.http import HttpRequest
-from django.core.files.uploadedfile import TemporaryUploadedFile
from dynamic_preferences.registries import preference_models
@@ -65,7 +64,7 @@ class CoreConfig(AppConfig):
if new_value:
Favicon.on_site.update_or_create(
title=name,
- defaults={"isFavicon": name == "favicon", "faviconImage": new_value, },
+ defaults={"isFavicon": name == "favicon", "faviconImage": new_value,},
)
else:
Favicon.on_site.filter(title=name, isFavicon=is_favicon).delete()
diff --git a/aleksis/core/mixins.py b/aleksis/core/mixins.py
index ca5ffc855..b6ae0b04c 100644
--- a/aleksis/core/mixins.py
+++ b/aleksis/core/mixins.py
@@ -1,3 +1,5 @@
+# flake8: noqa: DJ12
+
from datetime import datetime
from typing import Any, Callable, List, Optional, Tuple, Union
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index 6f4fff676..b5bb204c2 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -1,3 +1,5 @@
+# flake8: noqa: DJ01
+
from datetime import date, datetime
from typing import Iterable, List, Optional, Sequence, Union
@@ -81,7 +83,7 @@ class Person(ExtensibleModel):
)
short_name = models.CharField(
- verbose_name=_("Short name"), max_length=255, blank=True, null=True, unique=True # noqa
+ verbose_name=_("Short name"), max_length=255, blank=True, null=True, unique=True # noqa
)
street = models.CharField(verbose_name=_("Street"), max_length=255, blank=True)
@@ -151,16 +153,15 @@ class Person(ExtensibleModel):
@property
def mail_sender(self) -> str:
"""E-mail sender in "Name <email>" format."""
- return f"\"{self.addressing_name}\" <{self.email}>"
+ return f'"{self.addressing_name}" <{self.email}>'
@property
def mail_sender_via(self) -> str:
"""E-mail sender for via addresses, in "Name via Site <email>" format."""
-
site_mail = get_site_preferences()["mail__address"]
site_name = get_site_preferences()["general__title"]
- return f"\"{self.addressing_name} via {site_name}\" <{site_mail}>"
+ return f'"{self.addressing_name} via {site_name}" <{site_mail}>'
@property
def age(self):
@@ -271,7 +272,7 @@ class Group(ExtensibleModel):
name = models.CharField(verbose_name=_("Long name"), max_length=255, unique=True)
short_name = models.CharField(
- verbose_name=_("Short name"), max_length=255, unique=True, blank=True, null=True # noqa
+ verbose_name=_("Short name"), max_length=255, unique=True, blank=True, null=True # noqa
)
members = models.ManyToManyField(
diff --git a/aleksis/core/templatetags/html_helpers.py b/aleksis/core/templatetags/html_helpers.py
index 77b198f3f..a30a230ce 100644
--- a/aleksis/core/templatetags/html_helpers.py
+++ b/aleksis/core/templatetags/html_helpers.py
@@ -11,7 +11,6 @@ def add_class_to_el(value: str, arg: str) -> str:
Example: {{ mymodel.myhtmlfield|add_class_to_el:"ul,browser-default"
"""
-
el, cls = arg.split(",")
soup = BeautifulSoup(value, "html.parser")
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index 67c9daae5..522b930d4 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -228,6 +228,6 @@ def objectgetter_optional(
if id_ is not None:
return get_object_or_404(model, pk=id_)
else:
- return eval(default) if default_eval else default
+ return eval(default) if default_eval else default # noqa:S307
return get_object
--
GitLab