Skip to content
Snippets Groups Projects
Verified Commit 9d90bb21 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

[Reformat] Rename functions

parent 598962cd
No related branches found
No related tags found
No related merge requests found
from typing import Any, List, Optional, Tuple from typing import Any, List, Optional, Tuple
import django.apps import django.apps
from django.contrib.auth import get_user_model
from django.http import HttpRequest from django.http import HttpRequest
from dynamic_preferences.registries import preference_models from dynamic_preferences.registries import preference_models
...@@ -15,6 +16,9 @@ from .util.core_helpers import has_person ...@@ -15,6 +16,9 @@ from .util.core_helpers import has_person
from .util.sass_helpers import clean_scss from .util.sass_helpers import clean_scss
User = get_user_model()
class CoreConfig(AppConfig): class CoreConfig(AppConfig):
name = "aleksis.core" name = "aleksis.core"
verbose_name = "AlekSIS — The Free School Information System" verbose_name = "AlekSIS — The Free School Information System"
...@@ -23,7 +27,7 @@ class CoreConfig(AppConfig): ...@@ -23,7 +27,7 @@ class CoreConfig(AppConfig):
"Repository": "https://edugit.org/AlekSIS/official/AlekSIS/", "Repository": "https://edugit.org/AlekSIS/official/AlekSIS/",
} }
licence = "EUPL-1.2+" licence = "EUPL-1.2+"
copyright = ( copyright_info = (
([2017, 2018, 2019, 2020], "Jonathan Weth", "wethjo@katharineum.de"), ([2017, 2018, 2019, 2020], "Jonathan Weth", "wethjo@katharineum.de"),
([2017, 2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"), ([2017, 2018, 2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"),
([2018, 2019, 2020], "Julian Leucker", "leuckeju@katharineum.de"), ([2018, 2019, 2020], "Julian Leucker", "leuckeju@katharineum.de"),
......
...@@ -16,7 +16,7 @@ from material.base import Layout, LayoutNode ...@@ -16,7 +16,7 @@ from material.base import Layout, LayoutNode
from rules.contrib.admin import ObjectPermissionsModelAdmin from rules.contrib.admin import ObjectPermissionsModelAdmin
@reversion.register() @reversion.register
class ExtensibleModel(models.Model): class ExtensibleModel(models.Model):
"""Base model for all objects in AlekSIS apps. """Base model for all objects in AlekSIS apps.
...@@ -141,7 +141,7 @@ class ExtensibleModel(models.Model): ...@@ -141,7 +141,7 @@ class ExtensibleModel(models.Model):
cls.add_to_class(name, obj) cls.add_to_class(name, obj)
@classmethod @classmethod
def property(cls, func: Callable[[], Any], name: Optional[str] = None) -> None: def property_(cls, func: Callable[[], Any], name: Optional[str] = None) -> None:
"""Add the passed callable as a property.""" """Add the passed callable as a property."""
cls._safe_add(property(func), func.__name__) cls._safe_add(property(func), func.__name__)
......
...@@ -276,7 +276,7 @@ class Group(ExtensibleModel): ...@@ -276,7 +276,7 @@ class Group(ExtensibleModel):
blank=True, blank=True,
) )
type = models.ForeignKey( group_type = models.ForeignKey(
"GroupType", "GroupType",
on_delete=models.SET_NULL, on_delete=models.SET_NULL,
related_name="type", related_name="type",
...@@ -469,6 +469,7 @@ class Announcement(ExtensibleModel): ...@@ -469,6 +469,7 @@ class Announcement(ExtensibleModel):
def get_recipients_for_model(self, obj: Union[models.Model]) -> Sequence[models.Model]: def get_recipients_for_model(self, obj: Union[models.Model]) -> Sequence[models.Model]:
"""Get all recipients. """Get all recipients.
Get all recipients for this announcement Get all recipients for this announcement
with a special content type (provided through model) with a special content type (provided through model)
""" """
......
...@@ -125,10 +125,10 @@ class AppConfig(django.apps.AppConfig): ...@@ -125,10 +125,10 @@ class AppConfig(django.apps.AppConfig):
@classmethod @classmethod
def get_copyright(cls) -> Sequence[Tuple[str, str, str]]: def get_copyright(cls) -> Sequence[Tuple[str, str, str]]:
"""Get copyright information tuples for application package.""" """Get copyright information tuples for application package."""
copyrights = getattr(cls, "copyright", tuple()) copyrights = getattr(cls, "copyright_info", tuple())
copyrights_processed = [] copyrights_processed = []
for copyright in copyrights: for copyright_info in copyrights:
copyrights_processed.append( copyrights_processed.append(
( (
# Sort copyright years and combine year ranges for display # Sort copyright years and combine year ranges for display
......
from ast import literal_eval
import os import os
import pkgutil import pkgutil
from datetime import datetime, timedelta from datetime import datetime, timedelta
...@@ -228,6 +229,6 @@ def objectgetter_optional( ...@@ -228,6 +229,6 @@ def objectgetter_optional(
if id_ is not None: if id_ is not None:
return get_object_or_404(model, pk=id_) return get_object_or_404(model, pk=id_)
else: else:
return eval(default) if default_eval else default return literal_eval(default) if default_eval else default
return get_object return get_object
...@@ -191,11 +191,11 @@ def groups_child_groups(request: HttpRequest) -> HttpResponse: ...@@ -191,11 +191,11 @@ def groups_child_groups(request: HttpRequest) -> HttpResponse:
context = {} context = {}
# Apply filter # Apply filter
filter = GroupFilter(request.GET, queryset=Group.objects.all()) filter_ = GroupFilter(request.GET, queryset=Group.objects.all())
context["filter"] = filter context["filter"] = filter_
# Paginate # Paginate
paginator = Paginator(filter.qs, 1) paginator = Paginator(filter_.qs, 1)
page_number = request.POST.get("page", request.POST.get("old_page")) page_number = request.POST.get("page", request.POST.get("old_page"))
if page_number: if page_number:
......
...@@ -48,7 +48,7 @@ commands = ...@@ -48,7 +48,7 @@ commands =
[flake8] [flake8]
max_line_length = 100 max_line_length = 100
exclude = migrations,tests exclude = migrations,tests
ignore = BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107 ignore = BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RST214,F841,S106
[isort] [isort]
line_length = 100 line_length = 100
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment