💚 Fix linters

apps/activity/admin.py

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib import admin
-
 from note_kfet.admin import admin_site
+
 from .models import Activity, ActivityType, Guest, Entry
 
 

apps/activity/models.py

@@ -1,11 +1,11 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 from datetime import timedelta, datetime
 from threading import Thread
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.management import call_command
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone

apps/member/models.py

@@ -16,7 +16,6 @@ from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
-
 from permission.models import Role
 from registration.tokens import email_validation_token
 from note.models import MembershipTransaction
@@ -155,12 +154,12 @@ class Profile(models.Model):
                                               'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
                                           })
         html = loader.render_to_string('registration/mails/email_validation_email.html',
-                                          {
+                                       {
-                                              'user': self.user,
+                                           'user': self.user,
-                                              'domain': os.getenv("NOTE_URL", "note.example.com"),
+                                           'domain': os.getenv("NOTE_URL", "note.example.com"),
-                                              'token': email_validation_token.make_token(self.user),
+                                           'token': email_validation_token.make_token(self.user),
-                                              'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
+                                           'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
-                                          })
+                                       })
         self.user.email_user(subject, message, html_message=html)
 
 
@@ -329,7 +328,6 @@ class Membership(models.Model):
             club=self.club,
             date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
         )
-        from django.forms import model_to_dict
         if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
             new_membership._force_renew_parent = True
         if hasattr(self, '_soge') and self._soge:
@@ -445,8 +443,8 @@ class Membership(models.Model):
             )
             transaction._force_save = True
             if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\
-                    and (self.club.name == "BDE" or self.club.name == "Kfet" or
+                    and (self.club.name == "BDE" or self.club.name == "Kfet"
-                         ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
+                         or ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
                 # If the soge pays, then the transaction is unvalidated in a first time, then submitted for control
                 # to treasurers.
                 transaction.valid = False

apps/member/views.py

@@ -455,7 +455,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             while c.parent_club is not None:
                 c = c.parent_club
                 clubs_renewal.append(c)
-                additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid
+                additional_fee_renewal += c.membership_fee_paid
             context["clubs_renewal"] = clubs_renewal
             context["additional_fee_renewal"] = additional_fee_renewal
 
@@ -496,7 +496,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             form.fields['user'].disabled = True
             form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1)
             form.fields['credit_amount'].initial = (club.membership_fee_paid if user.profile.paid
-                else club.membership_fee_unpaid) + additional_fee_renewal
+                                                    else club.membership_fee_unpaid) + additional_fee_renewal
             form.fields['last_name'].initial = user.last_name
             form.fields['first_name'].initial = user.first_name
 

apps/note/api/serializers.py

@@ -1,10 +1,8 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-from django.utils import timezone
-from rest_framework import serializers
-from rest_framework.serializers import ListSerializer
-from rest_polymorphic.serializers import PolymorphicSerializer
 
+from rest_framework import serializers
+from rest_polymorphic.serializers import PolymorphicSerializer
 from member.api.serializers import MembershipSerializer
 from member.models import Membership
 from note_kfet.middlewares import get_current_authenticated_user

apps/note/api/views.py

@@ -9,7 +9,7 @@ from rest_framework import viewsets
 from rest_framework.response import Response
 from rest_framework import status
 from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
-from note_kfet.middlewares import  get_current_session
+from note_kfet.middlewares import get_current_session
 from permission.backends import PermissionBackend
 
 from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\

apps/note/models/transactions.py

@@ -7,7 +7,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from polymorphic.models import PolymorphicModel
 
-from .notes import Note, NoteClub, NoteSpecial, NoteUser
+from .notes import Note, NoteClub, NoteSpecial
 from ..templatetags.pretty_money import pretty_money
 
 """

apps/note/views.py

@@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, UpdateView, DetailView
 from django_tables2 import SingleTableView
 from django.urls import reverse_lazy
-
 from activity.models import Entry
 from note_kfet.inputs import AmountInput
 from permission.backends import PermissionBackend

apps/permission/models.py

@@ -5,7 +5,6 @@ import functools
 import json
 import operator
 from copy import copy
-from time import sleep
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError

apps/permission/tables.py

@@ -4,7 +4,6 @@
 import django_tables2 as tables
 from django.urls import reverse_lazy
 from django.utils.html import format_html
-
 from member.models import Membership
 from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend

apps/wei/forms/registration.py

@@ -6,7 +6,6 @@ from django.contrib.auth.models import User
 from django.db.models import Q
 from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
-
 from note.models import NoteSpecial
 from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
 

apps/wei/models.py

@@ -9,7 +9,6 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
-
 from member.models import Club, Membership
 from note.models import MembershipTransaction
 from permission.models import Role

apps/wei/tables.py

@@ -7,9 +7,9 @@ from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django_tables2 import A
-
 from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend
+
 from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership
 
 

apps/wei/views.py

@@ -28,7 +28,6 @@ from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSp
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
-from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 
 from .forms.registration import WEIChooseBusForm