From 7e20a36c413aac1de4f21388ff8aba6c9cc05a14 Mon Sep 17 00:00:00 2001
From: Joost Rijneveld <joost@joostrijneveld.nl>
Date: Sat, 22 Oct 2016 16:38:02 +0200
Subject: [PATCH] Apply isort to entire codebase

---
 .isort.cfg                                    |  6 ++++++
 website/activemembers/admin.py                |  1 +
 website/activemembers/models.py               |  5 +++--
 website/activemembers/tests.py                |  2 +-
 website/activemembers/views.py                |  4 ++--
 website/documents/admin.py                    |  5 ++---
 .../management/commands/migratedocuments.py   | 16 ++++++---------
 website/documents/models.py                   |  4 ++--
 website/documents/templatetags/filename.py    |  3 +--
 website/documents/views.py                    |  5 +++--
 website/education/admin.py                    |  1 +
 website/education/forms.py                    | 11 +++-------
 .../management/commands/migrateeducation.py   |  5 +++--
 website/education/models.py                   |  3 ++-
 website/education/views.py                    |  4 ++--
 website/events/admin.py                       |  6 +++---
 website/events/api/serializers.py             |  2 +-
 website/events/api/viewsets.py                |  5 +++--
 website/events/feeds.py                       |  3 ++-
 website/events/forms.py                       |  3 ++-
 .../management/commands/migrateevents.py      | 10 +++++-----
 website/events/models.py                      |  6 ++++--
 website/events/tests.py                       |  3 +--
 website/events/urls.py                        |  1 +
 website/events/views.py                       | 13 ++++++------
 website/mailinglists/admin.py                 |  2 +-
 .../management/commands/migratelists.py       |  7 +++----
 website/mailinglists/models.py                |  4 ++--
 website/mailinglists/views.py                 | 10 ++++++----
 website/members/admin.py                      |  4 ++--
 website/members/api/viewsets.py               |  6 +++---
 website/members/forms.py                      |  3 ++-
 .../management/commands/migratemembers.py     | 20 +++++++++----------
 website/members/models.py                     | 14 ++++++-------
 website/members/tests.py                      |  6 +++---
 website/members/urls.py                       |  1 -
 website/members/views.py                      |  8 ++++----
 website/merchandise/admin.py                  |  1 +
 .../management/commands/migratemerchandise.py | 10 +++++-----
 website/merchandise/models.py                 |  3 ++-
 website/newsletters/admin.py                  |  7 +------
 website/newsletters/models.py                 |  3 ++-
 website/newsletters/tests.py                  |  1 +
 website/newsletters/urls.py                   |  1 -
 website/newsletters/views.py                  |  3 ++-
 website/partners/admin.py                     | 10 ++--------
 website/partners/api/viewsets.py              |  7 ++++---
 website/partners/models.py                    |  3 ++-
 website/partners/views.py                     |  3 ++-
 website/photos/admin.py                       |  8 ++++----
 website/photos/models.py                      | 13 ++++++------
 website/photos/urls.py                        |  1 -
 website/photos/views.py                       | 13 ++++++------
 website/pizzas/admin.py                       |  5 +++--
 website/pizzas/models.py                      |  4 ++--
 website/pizzas/views.py                       | 14 ++++++-------
 website/thabloid/models.py                    | 12 +++++------
 website/thabloid/views.py                     |  2 +-
 website/thaliawebsite/admin.py                |  1 -
 website/thaliawebsite/settings/settings.py    |  1 +
 .../thaliawebsite/templatetags/bleach_tags.py |  2 +-
 website/thaliawebsite/urls.py                 | 13 ++++++------
 website/thaliawebsite/views.py                |  8 ++++----
 .../management/commands/createfixtures.py     | 11 ++++------
 .../utils/management/commands/legacylogin.py  |  6 +++---
 website/utils/snippets.py                     |  4 ++--
 website/utils/templatetags/thumbnail.py       |  6 +++---
 website/utils/tests.py                        |  7 ++++---
 website/utils/translation.py                  |  4 ++--
 website/utils/validators.py                   |  4 ++--
 website/utils/views.py                        |  6 +++---
 71 files changed, 204 insertions(+), 205 deletions(-)
 create mode 100644 .isort.cfg

diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 00000000..a672602f
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,6 @@
+[settings]
+skip=migrations
+multi_line_output=0
+balanced_wrapping=True
+known_third_party=django,rest_framework,sendfile,bs4,django_ical,bleach,factory,faker,requests
+
diff --git a/website/activemembers/admin.py b/website/activemembers/admin.py
index 1086041b..ca027a11 100644
--- a/website/activemembers/admin.py
+++ b/website/activemembers/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from utils.translation import TranslatedModelAdmin
 
 from . import models
diff --git a/website/activemembers/models.py b/website/activemembers/models.py
index e2633c00..cea6e24c 100644
--- a/website/activemembers/models.py
+++ b/website/activemembers/models.py
@@ -2,14 +2,15 @@ import datetime
 import logging
 
 from django.contrib.auth.models import Permission
-from django.core.exceptions import ValidationError, NON_FIELD_ERRORS
+from django.core.exceptions import NON_FIELD_ERRORS, ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+
 from members.models import Member
-from utils.translation import MultilingualField, ModelTranslateMeta
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 logger = logging.getLogger(__name__)
 
diff --git a/website/activemembers/tests.py b/website/activemembers/tests.py
index 9c13c870..be6d38b3 100644
--- a/website/activemembers/tests.py
+++ b/website/activemembers/tests.py
@@ -1,5 +1,5 @@
-from django.core.exceptions import ValidationError
 from django.contrib.auth import get_user_model
+from django.core.exceptions import ValidationError
 from django.db.utils import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
diff --git a/website/activemembers/views.py b/website/activemembers/views.py
index 59ccaf8a..904496c4 100644
--- a/website/activemembers/views.py
+++ b/website/activemembers/views.py
@@ -1,6 +1,6 @@
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import get_object_or_404, render
 
-from .models import Committee, CommitteeMembership, Board
+from .models import Board, Committee, CommitteeMembership
 
 
 def committee_index(request):
diff --git a/website/documents/admin.py b/website/documents/admin.py
index 75eedbeb..1f355fbc 100644
--- a/website/documents/admin.py
+++ b/website/documents/admin.py
@@ -1,8 +1,7 @@
 from django.contrib import admin
 
-from documents.models import AssociationDocumentsYear
-from documents.models import MiscellaneousDocument
-from documents.models import GeneralMeeting, GeneralMeetingDocument
+from documents.models import (AssociationDocumentsYear, GeneralMeeting,
+                              GeneralMeetingDocument, MiscellaneousDocument)
 
 
 class GeneralMeetingDocInline(admin.StackedInline):
diff --git a/website/documents/management/commands/migratedocuments.py b/website/documents/management/commands/migratedocuments.py
index f40574fa..1a9e6ecf 100644
--- a/website/documents/management/commands/migratedocuments.py
+++ b/website/documents/management/commands/migratedocuments.py
@@ -1,18 +1,14 @@
+import os
+
+import requests
+from bs4 import BeautifulSoup
 from django.core.files.base import ContentFile
 from django.utils import timezone
 from django.utils.timezone import datetime
 
+from documents.models import (AssociationDocumentsYear, GeneralMeeting,
+                              GeneralMeetingDocument, MiscellaneousDocument)
 from utils.management.commands import legacylogin
-from documents.models import (
-    GeneralMeeting,
-    GeneralMeetingDocument,
-    AssociationDocumentsYear,
-    MiscellaneousDocument
-)
-
-from bs4 import BeautifulSoup
-import requests
-import os
 
 
 def filefield_from_url(filefield, url):
diff --git a/website/documents/models.py b/website/documents/models.py
index d7691f01..67975aac 100644
--- a/website/documents/models.py
+++ b/website/documents/models.py
@@ -1,7 +1,7 @@
-from django.db import models
-from django.utils import timezone
 from django.core.validators import MinValueValidator
+from django.db import models
 from django.urls import reverse
+from django.utils import timezone
 
 from utils.validators import validate_file_extension
 
diff --git a/website/documents/templatetags/filename.py b/website/documents/templatetags/filename.py
index f16d722f..2cb29b31 100644
--- a/website/documents/templatetags/filename.py
+++ b/website/documents/templatetags/filename.py
@@ -1,7 +1,6 @@
-from django import template
-
 import os
 
+from django import template
 
 register = template.Library()
 
diff --git a/website/documents/views.py b/website/documents/views.py
index 18e1c5da..99f4e993 100644
--- a/website/documents/views.py
+++ b/website/documents/views.py
@@ -5,9 +5,10 @@ from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, render
 from django.utils import timezone
 from django.utils.text import slugify
-from documents.models import AssociationDocumentsYear, MiscellaneousDocument
-from documents.models import GeneralMeeting, GeneralMeetingDocument
 from sendfile import sendfile
+
+from documents.models import (AssociationDocumentsYear, GeneralMeeting,
+                              GeneralMeetingDocument, MiscellaneousDocument)
 from utils.snippets import datetime_to_lectureyear
 
 
diff --git a/website/education/admin.py b/website/education/admin.py
index f2ba6285..6ad0c03c 100644
--- a/website/education/admin.py
+++ b/website/education/admin.py
@@ -3,6 +3,7 @@ This module registers admin pages for the models
 """
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
+
 from utils.translation import TranslatedModelAdmin
 
 from . import models
diff --git a/website/education/forms.py b/website/education/forms.py
index 13447efa..65b6d505 100644
--- a/website/education/forms.py
+++ b/website/education/forms.py
@@ -1,13 +1,8 @@
 from django.conf import settings
-from django.forms import (
-    ModelForm,
-    DateField,
-    SelectDateWidget,
-    ModelChoiceField,
-    ChoiceField
-)
+from django.forms import (ChoiceField, DateField, ModelChoiceField,
+                          ModelForm, SelectDateWidget)
 
-from .models import Exam, Summary, Course
+from .models import Course, Exam, Summary
 
 
 class AddExamForm(ModelForm):
diff --git a/website/education/management/commands/migrateeducation.py b/website/education/management/commands/migrateeducation.py
index 007b53c3..1bf69530 100644
--- a/website/education/management/commands/migrateeducation.py
+++ b/website/education/management/commands/migrateeducation.py
@@ -4,11 +4,12 @@ import os
 import requests
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.exceptions import PermissionDenied, ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.core.files.base import ContentFile
 from django.utils.dateparse import parse_date
 from django.utils.translation import activate
-from education.models import Summary, Exam, Course, Category
+
+from education.models import Category, Course, Exam, Summary
 from utils.management.commands import legacylogin
 
 
diff --git a/website/education/models.py b/website/education/models.py
index 328a18c8..c635eb9e 100644
--- a/website/education/models.py
+++ b/website/education/models.py
@@ -3,8 +3,9 @@ from django.db import models
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+
 from utils.snippets import datetime_to_lectureyear
-from utils.translation import MultilingualField, ModelTranslateMeta
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class Category(models.Model, metaclass=ModelTranslateMeta):
diff --git a/website/education/views.py b/website/education/views.py
index 9f54ddb7..241e87fc 100644
--- a/website/education/views.py
+++ b/website/education/views.py
@@ -1,9 +1,9 @@
-import os
 import itertools
+import os
 from datetime import datetime
 
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import get_object_or_404, render
 from django.utils.translation import ugettext_lazy as _
 from sendfile import sendfile
 
diff --git a/website/events/admin.py b/website/events/admin.py
index a96c4244..7a989234 100644
--- a/website/events/admin.py
+++ b/website/events/admin.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from activemembers.models import Committee
 from django.contrib import admin
 from django.http import HttpResponseRedirect
 from django.urls import reverse
@@ -7,11 +6,12 @@ from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.http import is_safe_url
 from django.utils.translation import ugettext_lazy as _
+
+from activemembers.models import Committee
 from members.models import Member
 from utils.translation import TranslatedModelAdmin
 
-from . import forms
-from . import models
+from . import forms, models
 
 
 def _do_next(request, response):
diff --git a/website/events/api/serializers.py b/website/events/api/serializers.py
index 492c6f38..423c26a1 100644
--- a/website/events/api/serializers.py
+++ b/website/events/api/serializers.py
@@ -1,5 +1,5 @@
-from django.utils import timezone
 from django.urls import reverse
+from django.utils import timezone
 from rest_framework import serializers
 
 from events.models import Event
diff --git a/website/events/api/viewsets.py b/website/events/api/viewsets.py
index b0071a0a..1335c6ce 100644
--- a/website/events/api/viewsets.py
+++ b/website/events/api/viewsets.py
@@ -1,8 +1,9 @@
+from datetime import datetime
+
+from django.utils import timezone
 from rest_framework import viewsets
 from rest_framework.exceptions import ParseError
 from rest_framework.response import Response
-from django.utils import timezone
-from datetime import datetime
 
 from events.api.serializers import EventSerializer
 from events.models import Event
diff --git a/website/events/feeds.py b/website/events/feeds.py
index 7d66107f..66b88fd8 100644
--- a/website/events/feeds.py
+++ b/website/events/feeds.py
@@ -1,10 +1,11 @@
 from datetime import datetime, timedelta
 
 from django.urls import reverse
+from django.utils.translation import ugettext as _
 from django.utils.translation import activate
 from django_ical.views import ICalFeed
+
 from events.models import Event
-from django.utils.translation import ugettext as _
 
 
 class EventFeed(ICalFeed):
diff --git a/website/events/forms.py b/website/events/forms.py
index 3224bea4..12b03be5 100644
--- a/website/events/forms.py
+++ b/website/events/forms.py
@@ -1,5 +1,6 @@
 from django import forms
-from django.utils.translation import get_language, ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import get_language
 
 from .models import RegistrationInformationField
 
diff --git a/website/events/management/commands/migrateevents.py b/website/events/management/commands/migrateevents.py
index b0b0ac77..4176a57d 100644
--- a/website/events/management/commands/migrateevents.py
+++ b/website/events/management/commands/migrateevents.py
@@ -1,17 +1,17 @@
-import re
 import json
-import requests
-from django.contrib.auth.models import User
+import re
 from datetime import datetime
-from django.core.management.base import BaseCommand
+
+import requests
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
+from django.core.management.base import BaseCommand
 from django.utils import timezone
 
 import events.models as events_models
 import members.models as members_models
 
-
 FIELD_DATA_TYPES = {
     '0': events_models.RegistrationInformationField.TEXT_FIELD,
     '1': events_models.RegistrationInformationField.INTEGER_FIELD,
diff --git a/website/events/models.py b/website/events/models.py
index eedbbc43..b59cd5a9 100644
--- a/website/events/models.py
+++ b/website/events/models.py
@@ -4,8 +4,10 @@ from django.db import models
 from django.db.models import Q
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _, string_concat
-from utils.translation import MultilingualField, ModelTranslateMeta
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import string_concat
+
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class Event(models.Model, metaclass=ModelTranslateMeta):
diff --git a/website/events/tests.py b/website/events/tests.py
index 4d115d44..3ffe3327 100644
--- a/website/events/tests.py
+++ b/website/events/tests.py
@@ -4,9 +4,8 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.utils import timezone
 
-from members.models import Member
-
 from events.models import Event, Registration
+from members.models import Member
 
 
 class RegistrationTest(TestCase):
diff --git a/website/events/urls.py b/website/events/urls.py
index d0643e59..3e5c9273 100644
--- a/website/events/urls.py
+++ b/website/events/urls.py
@@ -5,6 +5,7 @@ Events URL Configuration
 from django.conf.urls import url
 
 from events.feeds import EventFeed
+
 from . import views
 
 urlpatterns = [
diff --git a/website/events/views.py b/website/events/views.py
index 0e99db0d..83d9ae83 100644
--- a/website/events/views.py
+++ b/website/events/views.py
@@ -2,18 +2,19 @@ import csv
 import json
 from datetime import timedelta
 
-from django.http import HttpResponse, JsonResponse
-from django.views.decorators.http import require_http_methods
-from django.shortcuts import render, get_object_or_404, redirect
 from django.contrib import messages
 from django.contrib.admin.views.decorators import staff_member_required
-from django.contrib.auth.decorators import permission_required, login_required
+from django.contrib.auth.decorators import login_required, permission_required
+from django.http import HttpResponse, JsonResponse
+from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _, pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import pgettext_lazy
+from django.views.decorators.http import require_http_methods
 
-from .models import Event, Registration, RegistrationInformationField
 from .forms import FieldsForm
+from .models import Event, Registration, RegistrationInformationField
 
 
 @staff_member_required
diff --git a/website/mailinglists/admin.py b/website/mailinglists/admin.py
index 5d634bed..e1491b94 100644
--- a/website/mailinglists/admin.py
+++ b/website/mailinglists/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import MailingList, VerbatimAddress, ListAlias
+from .models import ListAlias, MailingList, VerbatimAddress
 
 
 class VerbatimAddressInline(admin.TabularInline):
diff --git a/website/mailinglists/management/commands/migratelists.py b/website/mailinglists/management/commands/migratelists.py
index d44b16c0..4a3188bd 100644
--- a/website/mailinglists/management/commands/migratelists.py
+++ b/website/mailinglists/management/commands/migratelists.py
@@ -1,12 +1,11 @@
+import requests
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.base import BaseCommand
 
-from activemembers.models import Committee, Board
-from members.models import Member
+from activemembers.models import Board, Committee
 from mailinglists.models import MailingList, VerbatimAddress
-
-import requests
+from members.models import Member
 
 
 class Command(BaseCommand):
diff --git a/website/mailinglists/models.py b/website/mailinglists/models.py
index a0c7d929..9ddd9d3a 100644
--- a/website/mailinglists/models.py
+++ b/website/mailinglists/models.py
@@ -1,9 +1,9 @@
-from django.db import models
 from django.core import validators
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from members.models import Member
 from activemembers.models import Committee
+from members.models import Member
 
 
 class MailingList(models.Model):
diff --git a/website/mailinglists/views.py b/website/mailinglists/views.py
index 591fe75a..c428d109 100644
--- a/website/mailinglists/views.py
+++ b/website/mailinglists/views.py
@@ -1,12 +1,14 @@
+import hashlib
+
 from django.core.exceptions import PermissionDenied
-from django.shortcuts import render, get_object_or_404
 from django.http import Http404
+from django.shortcuts import get_object_or_404, render
 
-from .models import MailingList
-from members.models import Member
 from activemembers.models import CommitteeMembership
+from members.models import Member
+
+from .models import MailingList
 
-import hashlib
 
 # Consider replacing this completely;
 #  - either by a cronjob Python script that queries the database directly
diff --git a/website/members/admin.py b/website/members/admin.py
index a5f5da81..26d13517 100644
--- a/website/members/admin.py
+++ b/website/members/admin.py
@@ -5,11 +5,11 @@ import datetime
 
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.models import User
 from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
+from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 
-from . import models, forms
+from . import forms, models
 
 
 class MembershipInline(admin.StackedInline):
diff --git a/website/members/api/viewsets.py b/website/members/api/viewsets.py
index 7ef80233..aaa6c5fd 100644
--- a/website/members/api/viewsets.py
+++ b/website/members/api/viewsets.py
@@ -1,9 +1,9 @@
+import copy
+from datetime import datetime
+
 from django.utils import timezone
 from rest_framework import viewsets
 from rest_framework.decorators import list_route
-from datetime import datetime
-import copy
-
 from rest_framework.exceptions import ParseError
 from rest_framework.response import Response
 
diff --git a/website/members/forms.py b/website/members/forms.py
index d7fd67c4..4960853f 100644
--- a/website/members/forms.py
+++ b/website/members/forms.py
@@ -4,7 +4,8 @@ from django import forms
 from django.contrib.auth.models import User
 from django.template import loader
 from django.utils import translation
-from django.utils.translation import ugettext_lazy as _, ugettext as t
+from django.utils.translation import ugettext as t
+from django.utils.translation import ugettext_lazy as _
 
 from .models import Member
 
diff --git a/website/members/management/commands/migratemembers.py b/website/members/management/commands/migratemembers.py
index a744b1e5..dfef9c62 100644
--- a/website/members/management/commands/migratemembers.py
+++ b/website/members/management/commands/migratemembers.py
@@ -1,20 +1,20 @@
-from django.core.files.base import ContentFile
+import json
+import os
+
+import requests
+from bs4 import BeautifulSoup
 from django.conf import settings
+from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.dateparse import parse_date
+from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
-from django.contrib.auth.models import User
+from django.utils.dateparse import parse_date
 from django.utils.translation import activate
 
-from activemembers.models import (Board, Committee, CommitteeMembership,
-                                  Mentorship)
+from activemembers.models import (Board, Committee,
+                                  CommitteeMembership, Mentorship)
 from members.models import Member
 
-from bs4 import BeautifulSoup
-import requests
-import json
-import os
-
 
 def imagefield_from_url(imagefield, url):
     file = ContentFile(requests.get(url).content)
diff --git a/website/members/models.py b/website/members/models.py
index f7933d17..f98608eb 100644
--- a/website/members/models.py
+++ b/website/members/models.py
@@ -1,14 +1,14 @@
-from django.utils import timezone
+import operator
+from datetime import date, timedelta
+from functools import reduce
+
+from django.conf import settings
+from django.core import validators
 from django.db import models
 from django.db.models import Q
-from django.core import validators
-from django.conf import settings
 from django.urls import reverse
+from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
-from datetime import timedelta, date
-import operator
-from functools import reduce
-
 from localflavor.generic.countries.sepa import IBAN_SEPA_COUNTRIES
 from localflavor.generic.models import IBANField
 
diff --git a/website/members/tests.py b/website/members/tests.py
index fcb2546a..652eeef1 100644
--- a/website/members/tests.py
+++ b/website/members/tests.py
@@ -1,11 +1,11 @@
-from datetime import datetime, date, timedelta
+from datetime import date, datetime, timedelta
 
+from django.contrib.auth.models import User
 from django.test import TestCase
 from django.utils import timezone
-from django.contrib.auth.models import User
 
 from members.models import (Member, Membership,
-                            gen_stats_year, gen_stats_member_type)
+                            gen_stats_member_type, gen_stats_year)
 
 
 class MemberBirthdayTest(TestCase):
diff --git a/website/members/urls.py b/website/members/urls.py
index d371754b..3832b50e 100644
--- a/website/members/urls.py
+++ b/website/members/urls.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from . import views
 
-
 urlpatterns = [
     url('^become-a-member-document/(?P<pk>[0-9]*)', views.get_become_a_member_document, name='become-a-member-document'),
     url('^profile/(?P<pk>[0-9]*)$', views.profile, name='profile'),
diff --git a/website/members/views.py b/website/members/views.py
index a7798b19..b2bf178d 100644
--- a/website/members/views.py
+++ b/website/members/views.py
@@ -1,13 +1,13 @@
+import json
 import os
 from datetime import date, datetime
-from sendfile import sendfile
-import json
 
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, render
-from django.contrib.auth.decorators import login_required
 from django.utils.text import slugify
+from sendfile import sendfile
 
 from . import models
 from .forms import MemberForm
diff --git a/website/merchandise/admin.py b/website/merchandise/admin.py
index 65bec148..56c0733f 100644
--- a/website/merchandise/admin.py
+++ b/website/merchandise/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from utils.translation import TranslatedModelAdmin
 
 from .models import MerchandiseItem
diff --git a/website/merchandise/management/commands/migratemerchandise.py b/website/merchandise/management/commands/migratemerchandise.py
index 97b6c58f..8c5c8514 100644
--- a/website/merchandise/management/commands/migratemerchandise.py
+++ b/website/merchandise/management/commands/migratemerchandise.py
@@ -1,13 +1,13 @@
+import os
+from decimal import Decimal
+
+import requests
+from bs4 import BeautifulSoup
 from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
-from decimal import Decimal
 
 from merchandise.models import MerchandiseItem
 
-from bs4 import BeautifulSoup
-import requests
-import os
-
 
 def filefield_from_url(filefield, url):
     file = ContentFile(requests.get(url).content)
diff --git a/website/merchandise/models.py b/website/merchandise/models.py
index 1edb68c6..15d75773 100644
--- a/website/merchandise/models.py
+++ b/website/merchandise/models.py
@@ -1,5 +1,6 @@
 from django.db import models
-from utils.translation import MultilingualField, ModelTranslateMeta
+
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class MerchandiseItem(models.Model, metaclass=ModelTranslateMeta):
diff --git a/website/newsletters/admin.py b/website/newsletters/admin.py
index a74577a2..1230f27a 100644
--- a/website/newsletters/admin.py
+++ b/website/newsletters/admin.py
@@ -1,14 +1,9 @@
 from django.contrib import admin
 from django.shortcuts import redirect
 
+from newsletters.models import Newsletter, NewsletterEvent, NewsletterItem
 from utils.translation import TranslatedModelAdmin
 
-from newsletters.models import (
-    Newsletter,
-    NewsletterEvent,
-    NewsletterItem
-)
-
 
 class NewsletterItemInline(admin.StackedInline):
     model = NewsletterItem
diff --git a/website/newsletters/models.py b/website/newsletters/models.py
index 3757be53..03f534eb 100644
--- a/website/newsletters/models.py
+++ b/website/newsletters/models.py
@@ -3,7 +3,8 @@ from django.db import models
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from tinymce.models import HTMLField
-from utils.translation import MultilingualField, ModelTranslateMeta
+
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class Newsletter(models.Model, metaclass=ModelTranslateMeta):
diff --git a/website/newsletters/tests.py b/website/newsletters/tests.py
index b203fcbd..b5c3ebce 100644
--- a/website/newsletters/tests.py
+++ b/website/newsletters/tests.py
@@ -5,6 +5,7 @@ from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.urls import reverse
 from django.utils import timezone
+
 from newsletters.models import Newsletter, NewsletterEvent
 
 
diff --git a/website/newsletters/urls.py b/website/newsletters/urls.py
index 936a9f9f..a3b15b15 100644
--- a/website/newsletters/urls.py
+++ b/website/newsletters/urls.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from . import views
 
-
 urlpatterns = [
     url('^(?P<pk>\d+)/$', views.preview, name='preview'),
     url(r'admin/send/(?P<pk>\d+)/$', views.admin_send, name='admin-send'),
diff --git a/website/newsletters/views.py b/website/newsletters/views.py
index fdf9b515..2f4986ac 100644
--- a/website/newsletters/views.py
+++ b/website/newsletters/views.py
@@ -2,10 +2,11 @@ from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.mail import EmailMultiAlternatives
-from django.shortcuts import get_object_or_404, render, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template import Context
 from django.template.loader import get_template
 from django.utils import translation
+
 from members.models import Member
 from newsletters.models import Newsletter
 from partners.models import Partner
diff --git a/website/partners/admin.py b/website/partners/admin.py
index af83107b..4a4da3da 100644
--- a/website/partners/admin.py
+++ b/website/partners/admin.py
@@ -1,15 +1,9 @@
 from django.contrib import admin
 
+from partners.models import (Partner, PartnerEvent, PartnerImage,
+                             Vacancy, VacancyCategory)
 from utils.translation import TranslatedModelAdmin
 
-from partners.models import (
-    Partner,
-    PartnerImage,
-    VacancyCategory,
-    Vacancy,
-    PartnerEvent
-)
-
 
 class PartnerImageInline(admin.StackedInline):
     model = PartnerImage
diff --git a/website/partners/api/viewsets.py b/website/partners/api/viewsets.py
index f28370a4..031950ac 100644
--- a/website/partners/api/viewsets.py
+++ b/website/partners/api/viewsets.py
@@ -1,9 +1,10 @@
+from datetime import datetime
+
+from django.utils import timezone
 from rest_framework import viewsets
+from rest_framework.decorators import list_route
 from rest_framework.exceptions import ParseError
 from rest_framework.response import Response
-from rest_framework.decorators import list_route
-from django.utils import timezone
-from datetime import datetime
 
 from partners.api.serializers import PartnerEventSerializer
 from partners.models import Partner, PartnerEvent
diff --git a/website/partners/models.py b/website/partners/models.py
index d0268ba0..7481d8db 100644
--- a/website/partners/models.py
+++ b/website/partners/models.py
@@ -3,7 +3,8 @@ from django.db import models
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from tinymce.models import HTMLField
-from utils.translation import MultilingualField, ModelTranslateMeta
+
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class Partner(models.Model):
diff --git a/website/partners/views.py b/website/partners/views.py
index 96ac5838..6dd2c7ce 100644
--- a/website/partners/views.py
+++ b/website/partners/views.py
@@ -1,7 +1,8 @@
+from random import random
+
 from django.shortcuts import get_object_or_404, render
 
 from partners.models import Partner, Vacancy, VacancyCategory
-from random import random
 
 
 def index(request):
diff --git a/website/photos/admin.py b/website/photos/admin.py
index 0a4c2348..d1d6dd05 100644
--- a/website/photos/admin.py
+++ b/website/photos/admin.py
@@ -1,13 +1,13 @@
-from django.contrib import admin
+import os
+from zipfile import ZipFile
+
 from django import forms
 from django.conf import settings
+from django.contrib import admin
 from django.core.files.base import ContentFile
 
 from .models import Album, Photo
 
-import os
-from zipfile import ZipFile
-
 
 class AlbumForm(forms.ModelForm):
     album_archive = forms.FileField(
diff --git a/website/photos/models.py b/website/photos/models.py
index cd54891e..bedb1510 100644
--- a/website/photos/models.py
+++ b/website/photos/models.py
@@ -1,14 +1,13 @@
-from django.urls import reverse
-from django.conf import settings
-from django.utils.functional import cached_property
-from django.db import models
-
-from PIL import Image
-
 import hashlib
 import os
 import random
 
+from django.conf import settings
+from django.db import models
+from django.urls import reverse
+from django.utils.functional import cached_property
+from PIL import Image
+
 COVER_FILENAME = 'cover.jpg'
 
 
diff --git a/website/photos/urls.py b/website/photos/urls.py
index 049de7d1..28322967 100644
--- a/website/photos/urls.py
+++ b/website/photos/urls.py
@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from . import views
 
-
 urlpatterns = [
     url(r'^download/(?P<path>.*)', views.download, name='download'),
     url(r'^shared-download/(?P<slug>[-\w]+)/(?P<token>[a-zA-Z0-9]+)/(?P<path>.*)', views.shared_download, name='shared-download'),
diff --git a/website/photos/views.py b/website/photos/views.py
index c6ad4abf..fbacbe92 100644
--- a/website/photos/views.py
+++ b/website/photos/views.py
@@ -1,15 +1,16 @@
-from django.shortcuts import get_object_or_404, render
+import os
+
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.http import Http404
-from django.conf import settings
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.shortcuts import get_object_or_404, render
+from sendfile import sendfile
 
-from .models import Album
 from utils.snippets import sanitize_path
 from utils.views import _private_thumbnails_unauthed
 
-from sendfile import sendfile
-import os
+from .models import Album
 
 COVER_FILENAME = 'cover.jpg'
 
diff --git a/website/pizzas/admin.py b/website/pizzas/admin.py
index c1e4aa77..c5a876c5 100644
--- a/website/pizzas/admin.py
+++ b/website/pizzas/admin.py
@@ -1,8 +1,9 @@
 from django.contrib import admin
-from .models import PizzaEvent, Order, Product
+from django.core.urlresolvers import reverse
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+
+from .models import Order, PizzaEvent, Product
 
 admin.site.register(Product)
 
diff --git a/website/pizzas/models.py b/website/pizzas/models.py
index 78fc3f4c..344f8fdb 100644
--- a/website/pizzas/models.py
+++ b/website/pizzas/models.py
@@ -1,11 +1,11 @@
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils import timezone
-from django.core.exceptions import ValidationError
-from utils.translation import MultilingualField, ModelTranslateMeta
 from django.utils.translation import ugettext_lazy as _
 
 import events
 import members
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 
 class PizzaEvent(models.Model):
diff --git a/website/pizzas/views.py b/website/pizzas/views.py
index b748e256..a44c867f 100644
--- a/website/pizzas/views.py
+++ b/website/pizzas/views.py
@@ -1,15 +1,13 @@
-from django.shortcuts import render, get_object_or_404
-from django.views.decorators.http import require_http_methods
-from django.http import HttpResponseRedirect, JsonResponse
-from django.core.urlresolvers import reverse
 from django.contrib import messages
-from django.contrib.auth.decorators import permission_required
-from django.http import Http404
+from django.contrib.auth.decorators import login_required, permission_required
+from django.core.urlresolvers import reverse
+from django.http import Http404, HttpResponseRedirect, JsonResponse
+from django.shortcuts import get_object_or_404, render
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.decorators import login_required
+from django.views.decorators.http import require_http_methods
 
-from .models import Product, PizzaEvent, Order
 from .forms import AddOrderForm
+from .models import Order, PizzaEvent, Product
 
 
 @login_required
diff --git a/website/thabloid/models.py b/website/thabloid/models.py
index 21d10605..e4c73edb 100644
--- a/website/thabloid/models.py
+++ b/website/thabloid/models.py
@@ -1,15 +1,15 @@
-from django.db import models
+import os
+import shutil
+import subprocess
+
 from django.conf import settings
 from django.core.validators import MinValueValidator
-from django.utils.text import slugify
+from django.db import models
 from django.urls import reverse
+from django.utils.text import slugify
 
 from utils.validators import validate_file_extension
 
-import os
-import subprocess
-import shutil
-
 
 def thabloid_filename(instance, filename):
     ext = os.path.splitext(filename)[1]
diff --git a/website/thabloid/views.py b/website/thabloid/views.py
index 00360da7..0d99b91b 100644
--- a/website/thabloid/views.py
+++ b/website/thabloid/views.py
@@ -1,5 +1,5 @@
-from django.shortcuts import get_object_or_404, render
 from django.db.models import Max
+from django.shortcuts import get_object_or_404, render
 
 from .models import Thabloid
 
diff --git a/website/thaliawebsite/admin.py b/website/thaliawebsite/admin.py
index 7f4f6007..fdcf6091 100644
--- a/website/thaliawebsite/admin.py
+++ b/website/thaliawebsite/admin.py
@@ -1,6 +1,5 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
-
 admin.site.site_header = _('Thalia administration')
 admin.site.site_title = _('Thalia')
diff --git a/website/thaliawebsite/settings/settings.py b/website/thaliawebsite/settings/settings.py
index 1760c455..09195a5b 100644
--- a/website/thaliawebsite/settings/settings.py
+++ b/website/thaliawebsite/settings/settings.py
@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/dev/ref/settings/
 """
 
 import os
+
 from django.utils.translation import ugettext_lazy as _
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
diff --git a/website/thaliawebsite/templatetags/bleach_tags.py b/website/thaliawebsite/templatetags/bleach_tags.py
index fe9b20af..602cda9a 100644
--- a/website/thaliawebsite/templatetags/bleach_tags.py
+++ b/website/thaliawebsite/templatetags/bleach_tags.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals, print_function, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
 from bleach import clean
 from django import template
diff --git a/website/thaliawebsite/urls.py b/website/thaliawebsite/urls.py
index eeb56d80..79255306 100644
--- a/website/thaliawebsite/urls.py
+++ b/website/thaliawebsite/urls.py
@@ -19,25 +19,24 @@ Including another URLconf
 import os.path
 
 from django.conf import settings
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.sitemaps.views import sitemap
 from django.views.generic import TemplateView
 from django.views.i18n import JavaScriptCatalog
 
-from events.feeds import DeprecationFeed
-from utils.views import private_thumbnails
 import members
-
-from .sitemaps import StaticViewSitemap
 from activemembers.sitemaps import sitemap as activemembers_sitemap
-from members.sitemaps import sitemap as members_sitemap
 from documents.sitemaps import sitemap as documents_sitemap
-from thabloid.sitemaps import sitemap as thabloid_sitemap
+from events.feeds import DeprecationFeed
+from members.sitemaps import sitemap as members_sitemap
 from partners.sitemaps import sitemap as partners_sitemap
+from thabloid.sitemaps import sitemap as thabloid_sitemap
+from utils.views import private_thumbnails
 
 from . import views
+from .sitemaps import StaticViewSitemap
 
 thalia_sitemap = {
     'main-static': StaticViewSitemap,
diff --git a/website/thaliawebsite/views.py b/website/thaliawebsite/views.py
index a9c3d692..68d80d8d 100644
--- a/website/thaliawebsite/views.py
+++ b/website/thaliawebsite/views.py
@@ -1,10 +1,10 @@
+from django.conf import settings
 from django.contrib.auth import authenticate, login
-from django.views.decorators.http import require_POST
-from django.http import (HttpResponseBadRequest, HttpResponseForbidden,
-                         JsonResponse)
+from django.http import (HttpResponseBadRequest,
+                         HttpResponseForbidden, JsonResponse)
 from django.utils import timezone
-from django.conf import settings
 from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_POST
 
 from members.models import Member
 
diff --git a/website/utils/management/commands/createfixtures.py b/website/utils/management/commands/createfixtures.py
index 846fa7cd..e2237f14 100644
--- a/website/utils/management/commands/createfixtures.py
+++ b/website/utils/management/commands/createfixtures.py
@@ -1,21 +1,18 @@
 import random
 import string
 import tempfile
-
 from datetime import date
 
+import factory
 from django.contrib.auth.models import User
-
-from django.core.management.base import BaseCommand
-
 from django.core.files import File
+from django.core.management.base import BaseCommand
+from faker import Factory as FakerFactory
 
 from members.models import Member, Membership
 from partners.models import Partner
-
 from pydenticon import Generator as IconGenerator
-import factory
-from faker import Factory as FakerFactory
+
 faker = FakerFactory.create('nl_NL')
 
 
diff --git a/website/utils/management/commands/legacylogin.py b/website/utils/management/commands/legacylogin.py
index 8f503bd4..cd9d3567 100644
--- a/website/utils/management/commands/legacylogin.py
+++ b/website/utils/management/commands/legacylogin.py
@@ -1,8 +1,8 @@
-from django.core.management.base import BaseCommand
+import getpass
 
-from bs4 import BeautifulSoup
 import requests
-import getpass
+from bs4 import BeautifulSoup
+from django.core.management.base import BaseCommand
 
 
 class Command(BaseCommand):
diff --git a/website/utils/snippets.py b/website/utils/snippets.py
index d573ee27..fc1133dc 100644
--- a/website/utils/snippets.py
+++ b/website/utils/snippets.py
@@ -1,8 +1,8 @@
+import os
+
 from django.utils import timezone
 from django.utils.six.moves.urllib.parse import unquote
 
-import os
-
 
 def datetime_to_lectureyear(date):
     if isinstance(date, timezone.datetime):
diff --git a/website/utils/templatetags/thumbnail.py b/website/utils/templatetags/thumbnail.py
index f01bd316..65a96190 100644
--- a/website/utils/templatetags/thumbnail.py
+++ b/website/utils/templatetags/thumbnail.py
@@ -1,10 +1,10 @@
+import os
+
 from django import template
 from django.conf import settings
-from django.urls import reverse
 from django.db.models.fields.files import ImageFieldFile
-
+from django.urls import reverse
 from PIL import Image, ImageOps
-import os
 
 register = template.Library()
 
diff --git a/website/utils/tests.py b/website/utils/tests.py
index f07f1733..8d441b38 100644
--- a/website/utils/tests.py
+++ b/website/utils/tests.py
@@ -1,8 +1,9 @@
+from django.core.exceptions import FieldError
 from django.db import models
-from utils.translation import MultilingualField, ModelTranslateMeta
-from django.utils import translation
 from django.test import TestCase, override_settings
-from django.core.exceptions import FieldError
+from django.utils import translation
+
+from utils.translation import ModelTranslateMeta, MultilingualField
 
 LANGUAGES = [
     ('en', 'English'),
diff --git a/website/utils/translation.py b/website/utils/translation.py
index 4306e2c7..0fbe01a7 100644
--- a/website/utils/translation.py
+++ b/website/utils/translation.py
@@ -1,9 +1,9 @@
+from django.conf import settings
 from django.contrib import admin
+from django.core.exceptions import FieldError, ImproperlyConfigured
 from django.db import models
 from django.db.models.fields.related import RelatedField
-from django.conf import settings
 from django.utils.translation import get_language, string_concat
-from django.core.exceptions import ImproperlyConfigured, FieldError
 
 """This module makes it easy to define translatable model fields.
 
diff --git a/website/utils/validators.py b/website/utils/validators.py
index 68f1531d..2f4607ea 100644
--- a/website/utils/validators.py
+++ b/website/utils/validators.py
@@ -1,7 +1,7 @@
-from django.core.exceptions import ValidationError
-
 import os
 
+from django.core.exceptions import ValidationError
+
 
 def validate_file_extension(file, exts=['.txt', '.pdf', '.jpg', '.png']):
     ext = os.path.splitext(file.name)[1]
diff --git a/website/utils/views.py b/website/utils/views.py
index 7c74f650..a16ec4cb 100644
--- a/website/utils/views.py
+++ b/website/utils/views.py
@@ -1,9 +1,9 @@
+import os
+
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.http import Http404
-from django.conf import settings
-
 from sendfile import sendfile
-import os
 
 from .snippets import sanitize_path
 
-- 
GitLab