Format looots of code

website/activemembers/admin.py

@@ -19,9 +19,9 @@ class MemberGroupMembershipInlineFormSet(forms.BaseInlineFormSet):
     """
     Solely here for performance reasons.
 
-    Needed because the `__str__()` of `MemberGroupMembership` (which is displayed
-    above each inline form) uses the username, name of the member and name of
-    the group.
+    Needed because the `__str__()` of `MemberGroupMembership` (which is
+    displayed above each inline form) uses the username, name of the member
+    and name of the group.
     """
 
     def __init__(self, *args, **kwargs):
@@ -40,28 +40,6 @@ class MemberGroupMembershipInline(admin.StackedInline):
     autocomplete_fields = ('member',)
 
 
-@admin.register(models.Committee)
-class CommitteeAdmin(TranslatedModelAdmin):
-    """Manage the committees"""
-    inlines = (MemberGroupMembershipInline,)
-    form = MemberGroupForm
-    list_display = ('name', 'since', 'until', 'active', 'email')
-    list_filter = ('until', 'active',)
-    search_fields = ('name', 'description')
-    filter_horizontal = ('permissions',)
-
-    fields = ('name', 'description', 'photo', 'permissions', 'since',
-              'until', 'contact_mailinglist', 'contact_email',
-              'wiki_namespace', 'active')
-
-    def email(self, instance):
-        if instance.contact_email:
-            return instance.contact_email
-        elif instance.contact_mailinglist:
-            return instance.contact_mailinglist.name + '@thalia.nu'
-        return None
-
-
 @admin.register(models.Society)
 class CommitteeAdmin(TranslatedModelAdmin):
     """Manage the societies"""

website/activemembers/templatetags/activemembers_cards.py

@@ -31,7 +31,8 @@ def membergroup_member_card(membership):
     if 'since' in membership:
         since_text = _('Committee member since: ') + '?'
         if membership['since'].year > 1970:
-            since_text = _('Committee member since: ') + str(membership['since'].year)
+            since_text = _('Committee member since: {}').format(
+                membership['since'].year)
         meta_text += '<p class="px-1">{}</p>'.format(since_text)
     if 'role' in membership and membership['role']:
         meta_text += '<p class="px-1">{}</p>'.format(membership['role'])

website/activemembers/tests.py

@@ -59,25 +59,26 @@ class CommitteeMembersTest(TestCase):
         m1 = MemberGroupMembership(group=self.testcie,
                                    member=self.testuser,
                                    since=timezone.now().date().replace(
-                                     year=2014, month=1, day=1),
+                                       year=2014, month=1, day=1),
                                    until=timezone.now().date().replace(
-                                     year=2014, month=3, day=1))
+                                       year=2014, month=3, day=1))
         m1.save()
 
         m2 = MemberGroupMembership(group=self.testcie,
                                    member=self.testuser,
                                    since=timezone.now().date().replace(
-                                     year=2014, month=1, day=1),
+                                       year=2014, month=1, day=1),
                                    until=timezone.now().date().replace(
-                                     year=2014, month=2, day=1))
+                                       year=2014, month=2, day=1))
         with self.assertRaises(ValidationError):
             m2.full_clean()
 
     def test_until_date(self):
-        m = MemberGroupMembership(group=self.testcie,
-                                  member=self.testuser,
-                                  until=timezone.now().date().replace(year=2000),
-                                  chair=False)
+        m = MemberGroupMembership(
+                group=self.testcie,
+                member=self.testuser,
+                until=timezone.now().date().replace(year=2000),
+                chair=False)
         with self.assertRaises(ValidationError):
             m.clean()
         m.since = timezone.now().date().replace(year=1900)

website/activemembers/views.py

@@ -2,8 +2,7 @@ from django.shortcuts import get_object_or_404, render, redirect, reverse
 import datetime
 from utils.snippets import datetime_to_lectureyear
 from utils.translation import localize_attr_name
-from .models import Board, MemberGroup, MemberGroupMembership, Committee, \
-    Society
+from .models import Board, MemberGroupMembership, Committee, Society
 
 
 def committee_index(request):

website/events/api/serializers.py

@@ -185,7 +185,10 @@ class EventRetrieveSerializer(serializers.ModelSerializer):
         return instance.is_pizza_event()
 
     def _google_maps_url(self, instance):
-        return create_google_maps_url(instance.map_location, zoom=13, size='450x250')
+        return create_google_maps_url(
+                instance.map_location,
+                zoom=13,
+                size='450x250')
 
 
 class EventListSerializer(serializers.ModelSerializer):

website/events/api/viewsets.py

@@ -33,7 +33,8 @@ def _extract_date(param):
     if param is None:
         return None
     try:
-        return timezone.make_aware(datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
+        return timezone.make_aware(
+            datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
     except ValueError:
         return timezone.make_aware(datetime.strptime(param, '%Y-%m-%d'))
 
@@ -161,7 +162,8 @@ class EventViewset(viewsets.ReadOnlyModelViewSet):
                 queryset, many=True, context={'member': request.member})
         return Response(serializer.data)
 
-    @action(detail=False, permission_classes=(IsAdminUser, UnpublishedEventPermissions,))
+    @action(detail=False,
+            permission_classes=(IsAdminUser, UnpublishedEventPermissions,))
     def unpublished(self, request):
         """
         Defines a custom route that outputs the correctly formatted

website/events/models.py

@@ -330,8 +330,8 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
                 start_reminder.save()
                 self.start_reminder = start_reminder
                 if self.registration_required:
-                    self.start_reminder.users.set(self.participants.values_list(
-                        'member', flat=True))
+                    self.start_reminder.users.set(
+                            self.participants.values_list('member', flat=True))
                 else:
                     self.start_reminder.users.set(Member.current_members.all())
             elif start_reminder.pk is not None:

website/mailinglists/services.py

@@ -36,8 +36,10 @@ def get_automatic_lists():
         ['leden', 'members'], '[THALIA]',
         Member.all_with_membership('member'), True, True, True)
     lists += _create_automatic_list(
-        ['begunstigers', 'benefactors'], '[THALIA]', Member.all_with_membership(
-            Membership.BENEFACTOR), multilingual=True)
+        ['begunstigers', 'benefactors'],
+        '[THALIA]',
+        Member.all_with_membership(Membership.BENEFACTOR),
+        multilingual=True)
     lists += _create_automatic_list(
         ['ereleden', 'honorary'], '[THALIA]', Member.all_with_membership(
             'honorary'), multilingual=True)

website/members/api/serializers.py

@@ -138,7 +138,9 @@ class MemberListSerializer(serializers.ModelSerializer):
     def _photo(self, instance):
         if instance.profile.photo:
             return self.context['request'].build_absolute_uri(
-                thumbnail(instance.profile.photo, settings.THUMBNAIL_SIZES['medium'], 1))
+                thumbnail(instance.profile.photo,
+                          settings.THUMBNAIL_SIZES['medium'],
+                          1))
         else:
             return self.context['request'].build_absolute_uri(
                 static('members/images/default-avatar.jpg'))

website/members/api/viewsets.py

@@ -20,7 +20,8 @@ def _extract_date(param):
     if param is None:
         return None
     try:
-        return timezone.make_aware(datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
+        return timezone.make_aware(
+                datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
     except ValueError:
         return timezone.make_aware(datetime.strptime(param, '%Y-%m-%d'))
 

website/members/templatetags/member_card.py

@@ -13,11 +13,13 @@ register = template.Library()
 @register.inclusion_tag('includes/grid_item.html')
 def member_card(member, meta_text=None, ribbon=None):
     if meta_text is None and member.profile.starting_year:
-        meta_text = '<p class="px-1">{}: {}</p>'.format(_('Cohort'), member.profile.starting_year)
+        meta_text = '<p class="px-1">{}: {}</p>'.format(
+                _('Cohort'), member.profile.starting_year)
 
     image_url = static('members/images/default-avatar.jpg')
     if member.profile.photo:
-        image_url = thumbnail(member.profile.photo, settings.THUMBNAIL_SIZES['medium'])
+        image_url = thumbnail(member.profile.photo,
+                              settings.THUMBNAIL_SIZES['medium'])
 
     return grid_item(
         title=member.profile.display_name(),

website/partners/api/viewsets.py

@@ -5,12 +5,15 @@ from pytz.exceptions import InvalidTimeError
 from rest_framework import viewsets, filters
 from rest_framework.decorators import action
 from rest_framework.exceptions import ParseError
-from rest_framework.permissions import IsAuthenticatedOrReadOnly, \
-    IsAuthenticated
+from rest_framework.permissions import (
+        IsAuthenticatedOrReadOnly, IsAuthenticated
+)
 from rest_framework.response import Response
 
-from partners.api.serializers import PartnerEventCalendarJSSerializer, \
-    PartnerEventSerializer, PartnerSerializer
+from partners.api.serializers import (
+        PartnerEventCalendarJSSerializer, PartnerEventSerializer,
+        PartnerSerializer
+)
 from partners.models import Partner, PartnerEvent
 
 
@@ -19,7 +22,8 @@ def _extract_date(param):
     if param is None:
         return None
     try:
-        return timezone.make_aware(datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
+        return timezone.make_aware(
+                datetime.strptime(param, '%Y-%m-%dT%H:%M:%S'))
     except ValueError:
         return timezone.make_aware(datetime.strptime(param, '%Y-%m-%d'))
 

website/payments/tests/test_views.py

@@ -100,11 +100,13 @@ class PaymentAdminViewTest(TestCase):
                     '/admin/payments/payment/%s/change/' % self.payment.pk
                 )
 
-                process_payment.assert_called_once_with(payment_qs, payment_type)
+                process_payment.assert_called_once_with(
+                        payment_qs, payment_type)
 
                 messages_success.assert_called_once_with(
-                    response.wsgi_request, _('Successfully processed %s.') %
-                                           model_ngettext(self.payment, 1)
+                    response.wsgi_request,
+                    _('Successfully processed %s.') %
+                    model_ngettext(self.payment, 1)
                 )
 
             with self.subTest('Send post with failed processing'):
@@ -115,6 +117,7 @@ class PaymentAdminViewTest(TestCase):
                                             })
 
                 messages_error.assert_called_once_with(
-                    response.wsgi_request, _('Could not process %s.') %
-                                           model_ngettext(self.payment, 1)
+                    response.wsgi_request,
+                    _('Could not process %s.') %
+                    model_ngettext(self.payment, 1)
                 )

website/payments/widgets.py

@@ -20,5 +20,3 @@ class PaymentWidget(Widget):
             context['url'] = payment.get_admin_url()
             context['processed'] = payment.processed
         return context
-
-

website/photos/models.py

@@ -3,7 +3,6 @@ import os
 import random
 import logging
 
-from PIL.JpegImagePlugin import JpegImageFile
 from django.conf import settings
 from django.db import models
 from django.urls import reverse

website/photos/tests/test_admin.py

 from io import BytesIO
 from zipfile import ZipFile
 
-from django.test import Client, TestCase, RequestFactory
+from django.test import Client, TestCase
 
 from members.models import Member
 from photos.models import Album, Photo

website/photos/tests/test_views.py

@@ -127,7 +127,6 @@ class AlbumTest(TestCase):
                 since=date(year=2015, month=1, day=1),
                 until=None)
 
-
         for i in range(10):
             with open("photos/fixtures/thom_assessor.png", "rb") as f:
                 fi = SimpleUploadedFile(name='photo{}.png'.format(i),
@@ -150,7 +149,7 @@ class AlbumTest(TestCase):
                 until=date(year=2018, month=1, day=1))
 
         with self.subTest():
-            self.album.date=date(year=2017, month=1, day=1)
+            self.album.date = date(year=2017, month=1, day=1)
             self.album.save()
 
             response = self.client.get(reverse(
@@ -158,7 +157,7 @@ class AlbumTest(TestCase):
             self.assertEqual(response.status_code, 200)
 
         with self.subTest():
-            self.album.date=date(year=2018, month=9, day=5)
+            self.album.date = date(year=2018, month=9, day=5)
             self.album.save()
 
             response = self.client.get(reverse(

website/registrations/admin.py

@@ -5,7 +5,6 @@ from django.forms import Field
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
-from members.models import Membership
 from payments.widgets import PaymentWidget
 from . import services
 from .models import Entry, Registration, Renewal
@@ -89,7 +88,8 @@ class RegistrationAdmin(admin.ModelAdmin):
                 request.user.has_perm('registrations.review_entries')):
             obj = Entry.objects.get(id=object_id)
             can_review = obj.status == Entry.STATUS_REVIEW
-            can_revert = obj.status in [Entry.STATUS_ACCEPTED, Entry.STATUS_REJECTED]
+            can_revert = obj.status in [
+                    Entry.STATUS_ACCEPTED, Entry.STATUS_REJECTED]
             try:
                 can_resend = obj.registration.status == Entry.STATUS_CONFIRM
             except Registration.DoesNotExist:

website/registrations/forms.py

@@ -4,7 +4,6 @@ from django.forms import TypedChoiceField
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
-from payments.widgets import PaymentWidget
 from utils.snippets import datetime_to_lectureyear
 from .models import Registration, Renewal
 

website/registrations/tests/test_views.py

@@ -107,7 +107,7 @@ class EntryAdminViewTest(TestCase):
     @mock.patch('registrations.services.accept_entries')
     @mock.patch('registrations.services.reject_entries')
     def test_post_accept(self, reject_entries, accept_entries,
-                        check_unique_user):
+                         check_unique_user):
         self.view.action = 'accept'
         for type, entry in {
             'registration': self.entry1,
@@ -215,7 +215,8 @@ class EntryAdminViewTest(TestCase):
             entry_qs = Entry.objects.filter(pk=entry.pk)
             send_email.reset_mock()
             send_email.return_value = None
-            with mock.patch('registrations.models.Entry.objects.filter') as qs_mock:
+            with mock.patch(
+                    'registrations.models.Entry.objects.filter') as qs_mock:
                 qs_mock.return_value = entry_qs
                 qs_mock.get = Mock(return_value=entry_qs.get())
 
@@ -246,7 +247,8 @@ class EntryAdminViewTest(TestCase):
             entry_qs = Entry.objects.filter(pk=entry.pk)
             revert.reset_mock()
             revert.return_value = None
-            with mock.patch('registrations.models.Entry.objects.filter') as qs_mock:
+            with mock.patch(
+                    'registrations.models.Entry.objects.filter') as qs_mock:
                 qs_mock.return_value = entry_qs
                 qs_mock.get = Mock(return_value=entry_qs.get())
 
@@ -367,7 +369,7 @@ class ConfirmEmailViewTest(TestCase):
                 self.assertEqual(response.status_code, 302)
                 self.assertEqual(response.url, '/registration/register/')
 
-            with self.subTest('Redirect when registration confirm gives error'):
+            with self.subTest('Redirect when registration confirm errors'):
                 confirm_entry.side_effect = ValidationError(message='Error')
 
                 response = self.client.get(reverse(
@@ -472,7 +474,8 @@ class RenewalFormViewTest(TestCase):
         )
         self.view.request = MagicMock()
 
-        with mock.patch('members.models.Membership.objects') as qs_mock:
+        with mock.patch('members.models.Membership.objects'
+                ) as _qs:  # noqa: F841
             Membership.objects.filter().exists.return_value = True
             context = self.view.get_context_data(form=MagicMock())
             self.assertEqual(len(context), 8)
@@ -557,7 +560,8 @@ class RenewalFormViewTest(TestCase):
 
             request = super_post.call_args[0][0]
             self.assertEqual(request.POST['member'], 2)
-            self.assertEqual(request.POST['membership_type'], Membership.BENEFACTOR)
+            self.assertEqual(request.POST['membership_type'],
+                             Membership.BENEFACTOR)
             self.assertEqual(request.POST['length'], Entry.MEMBERSHIP_YEAR)
 
     @mock.patch('registrations.emails.send_new_renewal_board_message')