Unverified Commit 7e20a36c authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Apply isort to entire codebase

parent 8aacf7db
[settings]
skip=migrations
multi_line_output=0
balanced_wrapping=True
known_third_party=django,rest_framework,sendfile,bs4,django_ical,bleach,factory,faker,requests
from django.contrib import admin from django.contrib import admin
from utils.translation import TranslatedModelAdmin from utils.translation import TranslatedModelAdmin
from . import models from . import models
......
...@@ -2,14 +2,15 @@ import datetime ...@@ -2,14 +2,15 @@ import datetime
import logging import logging
from django.contrib.auth.models import Permission 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.core.validators import MinValueValidator
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from members.models import Member from members.models import Member
from utils.translation import MultilingualField, ModelTranslateMeta from utils.translation import ModelTranslateMeta, MultilingualField
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
from django.core.exceptions import ValidationError
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.core.exceptions import ValidationError
from django.db.utils import IntegrityError from django.db.utils import IntegrityError
from django.test import TestCase from django.test import TestCase
from django.utils import timezone from django.utils import timezone
......
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): def committee_index(request):
......
from django.contrib import admin from django.contrib import admin
from documents.models import AssociationDocumentsYear from documents.models import (AssociationDocumentsYear, GeneralMeeting,
from documents.models import MiscellaneousDocument GeneralMeetingDocument, MiscellaneousDocument)
from documents.models import GeneralMeeting, GeneralMeetingDocument
class GeneralMeetingDocInline(admin.StackedInline): class GeneralMeetingDocInline(admin.StackedInline):
......
import os
import requests
from bs4 import BeautifulSoup
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.utils import timezone from django.utils import timezone
from django.utils.timezone import datetime from django.utils.timezone import datetime
from documents.models import (AssociationDocumentsYear, GeneralMeeting,
GeneralMeetingDocument, MiscellaneousDocument)
from utils.management.commands import legacylogin 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): def filefield_from_url(filefield, url):
......
from django.db import models
from django.utils import timezone
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils import timezone
from utils.validators import validate_file_extension from utils.validators import validate_file_extension
......
from django import template
import os import os
from django import template
register = template.Library() register = template.Library()
......
...@@ -5,9 +5,10 @@ from django.core.exceptions import PermissionDenied ...@@ -5,9 +5,10 @@ from django.core.exceptions import PermissionDenied
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from django.utils import timezone from django.utils import timezone
from django.utils.text import slugify from django.utils.text import slugify
from documents.models import AssociationDocumentsYear, MiscellaneousDocument
from documents.models import GeneralMeeting, GeneralMeetingDocument
from sendfile import sendfile from sendfile import sendfile
from documents.models import (AssociationDocumentsYear, GeneralMeeting,
GeneralMeetingDocument, MiscellaneousDocument)
from utils.snippets import datetime_to_lectureyear from utils.snippets import datetime_to_lectureyear
......
...@@ -3,6 +3,7 @@ This module registers admin pages for the models ...@@ -3,6 +3,7 @@ This module registers admin pages for the models
""" """
from django.contrib import admin from django.contrib import admin
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from utils.translation import TranslatedModelAdmin from utils.translation import TranslatedModelAdmin
from . import models from . import models
......
from django.conf import settings from django.conf import settings
from django.forms import ( from django.forms import (ChoiceField, DateField, ModelChoiceField,
ModelForm, ModelForm, SelectDateWidget)
DateField,
SelectDateWidget,
ModelChoiceField,
ChoiceField
)
from .models import Exam, Summary, Course from .models import Course, Exam, Summary
class AddExamForm(ModelForm): class AddExamForm(ModelForm):
......
...@@ -4,11 +4,12 @@ import os ...@@ -4,11 +4,12 @@ import os
import requests import requests
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User 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.core.files.base import ContentFile
from django.utils.dateparse import parse_date from django.utils.dateparse import parse_date
from django.utils.translation import activate 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 from utils.management.commands import legacylogin
......
...@@ -3,8 +3,9 @@ from django.db import models ...@@ -3,8 +3,9 @@ from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from utils.snippets import datetime_to_lectureyear 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): class Category(models.Model, metaclass=ModelTranslateMeta):
......
import os
import itertools import itertools
import os
from datetime import datetime from datetime import datetime
from django.contrib.auth.decorators import login_required 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 django.utils.translation import ugettext_lazy as _
from sendfile import sendfile from sendfile import sendfile
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from activemembers.models import Committee
from django.contrib import admin from django.contrib import admin
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.urls import reverse from django.urls import reverse
...@@ -7,11 +6,12 @@ from django.utils import timezone ...@@ -7,11 +6,12 @@ from django.utils import timezone
from django.utils.html import format_html from django.utils.html import format_html
from django.utils.http import is_safe_url from django.utils.http import is_safe_url
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from activemembers.models import Committee
from members.models import Member from members.models import Member
from utils.translation import TranslatedModelAdmin from utils.translation import TranslatedModelAdmin
from . import forms from . import forms, models
from . import models
def _do_next(request, response): def _do_next(request, response):
......
from django.utils import timezone
from django.urls import reverse from django.urls import reverse
from django.utils import timezone
from rest_framework import serializers from rest_framework import serializers
from events.models import Event from events.models import Event
......
from datetime import datetime
from django.utils import timezone
from rest_framework import viewsets from rest_framework import viewsets
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from rest_framework.response import Response from rest_framework.response import Response
from django.utils import timezone
from datetime import datetime
from events.api.serializers import EventSerializer from events.api.serializers import EventSerializer
from events.models import Event from events.models import Event
......
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.urls import reverse from django.urls import reverse
from django.utils.translation import ugettext as _
from django.utils.translation import activate from django.utils.translation import activate
from django_ical.views import ICalFeed from django_ical.views import ICalFeed
from events.models import Event from events.models import Event
from django.utils.translation import ugettext as _
class EventFeed(ICalFeed): class EventFeed(ICalFeed):
......
from django import forms 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 from .models import RegistrationInformationField
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment