coding style

fet2020/members/admin.py

@@ -1,8 +1,8 @@
 from django.contrib import admin
 from django.utils.translation import gettext as _
 
-from .models import Member, Job, JobGroup, JobMember
+from .forms import JobForm, JobGroupForm, MemberForm
-from .forms import MemberForm, JobForm, JobGroupForm
+from .models import Job, JobGroup, JobMember, Member
 
 
 class MemberRoleFilter(admin.SimpleListFilter):

fet2020/members/forms.py

@@ -1,8 +1,8 @@
+from ckeditor_uploader.widgets import CKEditorUploadingWidget
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from ckeditor_uploader.widgets import CKEditorUploadingWidget
-
 from .models import Member, Job, JobGroup
 
 

fet2020/members/managers.py

@@ -1,9 +1,9 @@
+from datetime import timedelta
+
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone
 
-from datetime import timedelta
-
 
 class ActiveJobMemberManager(models.Manager):
     """return a list of active member, and members who are still working."""

fet2020/members/models.py

@@ -1,12 +1,13 @@
 import logging
 
+from easy_thumbnails.fields import ThumbnailerImageField
+
 from django.contrib.auth.models import User
 from django.core.validators import ValidationError, validate_email
 from django.db import models
 from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
-from easy_thumbnails.fields import ThumbnailerImageField
 
 from .managers import (
     ActiveJobMemberManager,
@@ -40,7 +41,7 @@ class Member(models.Model):
         max_length=128,
         validators=[validate_email, validate_domainonly_email],
         error_messages={
-            'unique': _("Diese Mailadresse existiert schon."),
+            "unique": _("Diese Mailadresse existiert schon."),
         },
     )
 

fet2020/members/serializers.py

@@ -1,7 +1,7 @@
-from .models import Member, Job, JobGroup, JobMember
-
 from rest_framework import serializers
 
+from .models import Member, Job, JobGroup, JobMember
+
 
 class MemberSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:

fet2020/members/tests.py

@@ -3,12 +3,13 @@ import os
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 
-from .models import Member, Job, JobGroup
+from .forms import JobForm, JobGroupForm, MemberForm
-from .forms import MemberForm, JobForm, JobGroupForm
+from .models import Job, JobGroup, Member
 
 
 image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg")
 
+
 class MemberTestCase(TestCase):
     def setUp(self):
         member = Member()
@@ -89,8 +90,7 @@ class MemberFormTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors.as_data()['__all__'][0].message,
+            form.errors.as_data()["__all__"][0].message, "Es fehlt das Profilbild."
-            "Es fehlt das Profilbild."
         )
 
     def test_form_wrong_mailaccount(self):
@@ -113,8 +113,8 @@ class MemberFormTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors.as_data()['mailaccount'][0].message,
+            form.errors.as_data()["mailaccount"][0].message,
-            "In der Mailadresse fehlt die richtige Domäne."
+            "In der Mailadresse fehlt die richtige Domäne.",
         )
 
     def test_form_wrong_domain(self):
@@ -137,8 +137,8 @@ class MemberFormTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors.as_data()['mailaccount'][0].message,
+            form.errors.as_data()["mailaccount"][0].message,
-            "Gib eine gültige E-Mail Adresse an."
+            "Gib eine gültige E-Mail Adresse an.",
         )
 
     def test_form_wrong_phone_number(self):
@@ -160,11 +160,11 @@ class MemberFormTestCase(TestCase):
             files={"image": image},
         )
 
-        self.assertFalse(form.is_valid()) 
+        self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors.as_data()['phone'][0].message,
+            form.errors.as_data()["phone"][0].message,
             "Telefonnummer muss in diesem Format +999999999999 eingegeben werden. "
-            "Bis zu 15 Zahlen sind erlaubt."
+            "Bis zu 15 Zahlen sind erlaubt.",
         )
 
 

fet2020/members/validators.py

@@ -16,10 +16,12 @@ def validate_domainonly_email(value):
     if not "fet.at" in value:
         raise ValidationError(_("In der Mailadresse fehlt die richtige Domäne."))
 
+
 def validate_file_size(value):
     if value.size > 10 * 1024 * 1024:
         raise ValidationError(_("Die maximale Dateigröße ist 10MB."))
 
+
 def validate_image_dimension(value):
     if value.height < 150 or value.width < 150:
         raise ValidationError(
@@ -27,5 +29,5 @@ def validate_image_dimension(value):
             params={
                 "height": value.height,
                 "width": value.width,
-            }
+            },
         )

fet2020/members/views.py

@@ -1,11 +1,10 @@
 import logging
+from collections import deque
 
 from django.http import Http404
 from django.shortcuts import render
 
-from collections import deque
 from core.models import CustomFlatPage
-
 from .models import Member, JobMember, JobGroup
 
 logger = logging.getLogger(__name__)