isort formatting then black formatting

fet2020/authentications/authentications.py

@@ -1,9 +1,6 @@
 import logging
 
-from ldap3 import Connection
+from ldap3 import HASHED_SALTED_SHA, MODIFY_REPLACE, Connection, Server
-from ldap3 import HASHED_SALTED_SHA
-from ldap3 import MODIFY_REPLACE
-from ldap3 import Server
 from ldap3.core.exceptions import LDAPBindError
 from ldap3.utils.hashed import hashed
 

fet2020/authentications/forms.py

@@ -1,10 +1,8 @@
-from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
-from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib.auth.models import User
 from django.core.validators import ValidationError
 
-from .authentications import authentication
+from .authentications import authentication, change_password
-from .authentications import change_password
 
 
 class LoginForm(AuthenticationForm):

fet2020/authentications/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
-from . import apps
+from . import apps, views
-from . import views
 
 app_name = apps.AuthenticationsConfig.name
 

fet2020/authentications/views.py

@@ -1,15 +1,16 @@
 from django.contrib.auth import logout
-from django.contrib.auth.views import LoginView
+from django.contrib.auth.views import (
-from django.contrib.auth.views import PasswordChangeDoneView
+    LoginView,
-from django.contrib.auth.views import PasswordChangeView
+    PasswordChangeDoneView,
+    PasswordChangeView,
+)
 from django.shortcuts import redirect
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
-from django.urls import reverse_lazy
+
+from documents.etherpadlib import del_ep_cookie
 
 from .decorators import authenticated_user
-from .forms import LdapPasswordChangeForm
+from .forms import LdapPasswordChangeForm, LoginForm
-from .forms import LoginForm
-from documents.etherpadlib import del_ep_cookie
 
 
 class AuthLoginView(LoginView):

fet2020/blackboard/models.py

@@ -5,7 +5,6 @@ from django.db import models
 from django.urls import reverse
 from django.utils import timezone
 
-
 logger = logging.getLogger("blackboard")
 
 

fet2020/blackboard/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
-from . import apps
+from . import apps, views
-from . import views
 
 app_name = apps.BlackboardConfig.name
 

fet2020/core/admin.py

@@ -1,6 +1,5 @@
 import taggit.admin
-from django.contrib import admin
+from django.contrib import admin, auth
-from django.contrib import auth
 from django.contrib.flatpages.admin import FlatPageAdmin
 from django.contrib.flatpages.models import FlatPage
 from django.contrib.sites.models import Site

fet2020/documents/__init__.py

@@ -1,3 +1 @@
-from .api import create_pad
+from .api import create_pad, get_pad_html, set_pad_html
-from .api import get_pad_html
-from .api import set_pad_html

fet2020/documents/api.py

@@ -4,9 +4,7 @@ from contextlib import contextmanager
 from urllib.parse import urljoin
 
 from django.conf import settings
-from etherpad_lite import EtherpadException
+from etherpad_lite import EtherpadException, EtherpadLiteClient
-from etherpad_lite import EtherpadLiteClient
-
 
 logger = logging.getLogger(__name__)
 

fet2020/documents/etherpadlib.py

@@ -3,9 +3,10 @@ from datetime import timedelta
 from django.conf import settings
 from django.utils import timezone
 
-from .api import get_ep_client
 from authentications.decorators import ep_authenticated_user
 
+from .api import get_ep_client
+
 
 @ep_authenticated_user
 def __get_ep_sessionid(request):

fet2020/fet2020/urls.py

@@ -1,22 +1,21 @@
 from django.conf import settings
 from django.conf.urls.static import static
-from django.contrib import admin
+from django.contrib import admin, flatpages
-from django.contrib import flatpages
 from django.contrib.sitemaps.views import sitemap
-from django.urls import include
+from django.urls import include, path, re_path
-from django.urls import path
-from django.urls import re_path
 from django.views.generic import RedirectView
 from rest_framework import routers
 
-from . import views
+from members.viewsets import (
-from .sitemaps import sitemaps
+    JobGroupViewSet,
-from members.viewsets import JobGroupViewSet
+    JobMemberViewSet,
-from members.viewsets import JobMemberViewSet
+    JobViewSet,
-from members.viewsets import JobViewSet
+    MemberViewSet,
-from members.viewsets import MemberViewSet
+)
 from posts.viewsets import PostViewSet
 
+from . import views
+from .sitemaps import sitemaps
 
 router = routers.DefaultRouter()
 router.register(r"posts", PostViewSet)

fet2020/fet2020/utils.py

@@ -1,9 +1,7 @@
 # util functions for all apps
 import uuid
 
-from django.contrib.admin.models import ADDITION
+from django.contrib.admin.models import ADDITION, CHANGE, LogEntry
-from django.contrib.admin.models import CHANGE
-from django.contrib.admin.models import LogEntry
 from django.contrib.admin.utils import construct_change_message
 from django.contrib.contenttypes.models import ContentType
 

fet2020/fet2020/views.py

@@ -2,9 +2,7 @@ from collections import deque
 
 from django.shortcuts import render
 
-from posts.models import Event
+from posts.models import Event, FetMeeting, Post
-from posts.models import FetMeeting
-from posts.models import Post
 
 
 def index(request):

fet2020/gallery/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
-from . import apps
+from . import apps, views
-from . import views
 
 app_name = apps.GalleryConfig.name
 

fet2020/gallery/utils.py

@@ -2,10 +2,7 @@ import logging
 import os
 
 from django.conf import settings
-from PIL import ExifTags
+from PIL import ExifTags, Image, ImageOps
-from PIL import Image
-from PIL import ImageOps
-
 
 gallery_path = settings.GALLERY["path"]
 gallery_thumb_path = settings.GALLERY["thumb_path"]

fet2020/gallery/views.py

@@ -6,11 +6,11 @@ from django.http import Http404
 from django.shortcuts import render
 from django.utils.text import slugify
 
-from .models import Album
-from .utils import create_thumbs
-from .utils import get_folder_list
 from authentications.decorators import authenticated_user
 
+from .models import Album
+from .utils import create_thumbs, get_folder_list
+
 
 def index(request):
     if request.user.is_authenticated:

fet2020/intern/admin.py

@@ -1,20 +1,18 @@
 from django.contrib import admin
 from django.db.models import F
 
-from .forms import AttachmentAdminForm
+from .forms import (
-from .forms import AttachmentInlineForm
+    AttachmentAdminForm,
-from .forms import EtherpadAdminForm
+    AttachmentInlineForm,
-from .forms import EtherpadInlineForm
+    EtherpadAdminForm,
-from .forms import FileUploadAdminForm
+    EtherpadInlineForm,
-from .forms import FileUploadInlineForm
+    FileUploadAdminForm,
-from .forms import TopicAdminForm
+    FileUploadInlineForm,
-from .forms import TopicGroupAdminForm
+    TopicAdminForm,
-from .forms import TopicInlineForm
+    TopicGroupAdminForm,
-from .models import Attachment
+    TopicInlineForm,
-from .models import Etherpad
+)
-from .models import FileUpload
+from .models import Attachment, Etherpad, FileUpload, Topic, TopicGroup
-from .models import Topic
-from .models import TopicGroup
 
 
 class TopicInline(admin.TabularInline):

fet2020/intern/forms.py

@@ -3,13 +3,9 @@ from ckeditor_uploader.widgets import CKEditorUploadingWidget
 from django import forms
 from django.forms.widgets import HiddenInput
 
-from .models import Attachment
+from tasks.models import Task, TaskList
-from .models import Etherpad
+
-from .models import FileUpload
+from .models import Attachment, Etherpad, FileUpload, Topic, TopicGroup
-from .models import Topic
-from .models import TopicGroup
-from tasks.models import Task
-from tasks.models import TaskList
 
 
 class DateInput(forms.DateInput):

fet2020/intern/models.py

@@ -9,8 +9,7 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.text import slugify
 
-from documents import create_pad
+from documents import create_pad, get_pad_html
-from documents import get_pad_html
 from documents.api import get_pad_link
 from fet2020.utils import create_random_id
 from tasks.models import TaskList

fet2020/intern/urls.py

@@ -1,18 +1,17 @@
-from django.urls import include
+from django.urls import include, path
-from django.urls import path
-
-from . import apps
-from . import views
-from .views import AttachmentCreateView
-from .views import AttachmentDetailView
-from .views import AttachmentUpdateView
-from .views import EtherpadCreateView
-from .views import FileUploadCreateView
-from .views import TaskCreateView
-from .views import TopicCreateView
-from .views import TopicDetailView
-from .views import TopicUpdateView
 
+from . import apps, views
+from .views import (
+    AttachmentCreateView,
+    AttachmentDetailView,
+    AttachmentUpdateView,
+    EtherpadCreateView,
+    FileUploadCreateView,
+    TaskCreateView,
+    TopicCreateView,
+    TopicDetailView,
+    TopicUpdateView,
+)
 
 app_name = apps.InternConfig.name
 

fet2020/intern/views.py

@@ -2,32 +2,28 @@ import logging
 from collections import deque
 
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import F
+from django.db.models import F, Q
-from django.db.models import Q
 from django.shortcuts import render
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
-from django.urls import reverse_lazy
 from django.views.generic.detail import DetailView
-from django.views.generic.edit import CreateView
+from django.views.generic.edit import CreateView, UpdateView
-from django.views.generic.edit import UpdateView
 
-from .forms import AttachmentCreateForm
-from .forms import AttachmentUpdateForm
-from .forms import EtherpadForm
-from .forms import FileUploadForm
-from .forms import TopicCreateForm
-from .forms import TopicUpdateForm
-from .models import Attachment
-from .models import Etherpad
-from .models import FileUpload
-from .models import Topic
-from .models import TopicGroup
 from authentications.decorators import authenticated_user
 from documents.etherpadlib import add_ep_cookie
 from fet2020.utils import add_log_action
 from tasks.forms import InternTaskCreateForm
 from tasks.models import Task
 
+from .forms import (
+    AttachmentCreateForm,
+    AttachmentUpdateForm,
+    EtherpadForm,
+    FileUploadForm,
+    TopicCreateForm,
+    TopicUpdateForm,
+)
+from .models import Attachment, Etherpad, FileUpload, Topic, TopicGroup
+
 logger = logging.getLogger(__name__)
 
 

fet2020/members/admin.py

@@ -1,13 +1,7 @@
 from django.contrib import admin
 
-from .forms import JobForm
+from .forms import JobForm, JobGroupForm, JobInlineForm, MemberForm
-from .forms import JobGroupForm
+from .models import Job, JobGroup, JobMember, Member
-from .forms import JobInlineForm
-from .forms import MemberForm
-from .models import Job
-from .models import JobGroup
-from .models import JobMember
-from .models import Member
 
 
 class MemberRoleFilter(admin.SimpleListFilter):

fet2020/members/forms.py

@@ -1,9 +1,7 @@
 from ckeditor_uploader.widgets import CKEditorUploadingWidget
 from django import forms
 
-from .models import Job
+from .models import Job, JobGroup, Member
-from .models import JobGroup
-from .models import Member
 
 
 class JobInlineForm(forms.ModelForm):

fet2020/members/models.py

@@ -1,21 +1,24 @@
 import logging
 
 from django.contrib.auth.models import User
-from django.core.validators import validate_email
+from django.core.validators import ValidationError, validate_email
-from django.core.validators import ValidationError
 from django.db import models
 from django.urls import reverse
 from django.utils.text import slugify
 from easy_thumbnails.fields import ThumbnailerImageField
 
-from .managers import ActiveJobMemberManager
+from .managers import (
-from .managers import InactiveJobMemberManager
+    ActiveJobMemberManager,
-from .managers import JobMemberManager
+    InactiveJobMemberManager,
-from .managers import MemberManager
+    JobMemberManager,
-from .validators import PhoneNumberValidator
+    MemberManager,
-from .validators import validate_domainonly_email
+)
-from .validators import validate_file_size
+from .validators import (
-from .validators import validate_image_dimension
+    PhoneNumberValidator,
+    validate_domainonly_email,
+    validate_file_size,
+    validate_image_dimension,
+)
 
 logger = logging.getLogger(__name__)
 

fet2020/members/serializers.py

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

fet2020/members/tests.py

@@ -3,13 +3,8 @@ import os
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 
-from .forms import JobForm
+from .forms import JobForm, JobGroupForm, MemberForm
-from .forms import JobGroupForm
+from .models import Job, JobGroup, Member
-from .forms import MemberForm
-from .models import Job
-from .models import JobGroup
-from .models import Member
-
 
 image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg")
 

fet2020/members/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
-from . import apps
+from . import apps, views
-from . import views
 
 app_name = apps.MembersConfig.name
 

fet2020/members/validators.py

@@ -1,5 +1,4 @@
-from django.core.validators import RegexValidator
+from django.core.validators import RegexValidator, ValidationError
-from django.core.validators import ValidationError
 from django.utils.deconstruct import deconstructible
 
 

fet2020/members/views.py

@@ -3,9 +3,7 @@ import logging
 from django.http import Http404
 from django.shortcuts import render
 
-from .models import JobGroup
+from .models import JobGroup, JobMember, Member
-from .models import JobMember
-from .models import Member
 
 logger = logging.getLogger(__name__)
 

fet2020/members/viewsets.py

@@ -1,14 +1,13 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import viewsets
 
-from .models import Job
+from .models import Job, JobGroup, JobMember, Member
-from .models import JobGroup
+from .serializers import (
-from .models import JobMember
+    JobGroupSerializer,
-from .models import Member
+    JobMemberSerializer,
-from .serializers import JobGroupSerializer
+    JobSerializer,
-from .serializers import JobMemberSerializer
+    MemberSerializer,
-from .serializers import JobSerializer
+)
-from .serializers import MemberSerializer
 
 
 class MemberViewSet(viewsets.ModelViewSet):

fet2020/posts/admin.py

@@ -1,17 +1,10 @@
-from django.contrib import admin
+from django.contrib import admin, messages
-from django.contrib import messages
 
-from .forms import EventForm
-from .forms import FetMeetingForm
-from .forms import NewsForm
-from .forms import PostForm
-from .models import Event
-from .models import FetMeeting
-from .models import FileUpload
-from .models import News
-from .models import Post
 from documents.api import create_pad
 
+from .forms import EventForm, FetMeetingForm, NewsForm, PostForm
+from .models import Event, FetMeeting, FileUpload, News, Post
+
 
 def make_fetmeeting(self, request, queryset):
     qs = self.get_queryset(request).filter(id=request.POST["_selected_action"]).first()

fet2020/posts/cronjobs.py

@@ -10,7 +10,6 @@ from django.utils import timezone
 from .mails import send_agenda_mail
 from .models import FetMeeting
 
-
 logger = logging.getLogger(__name__)
 
 

fet2020/posts/forms.py

@@ -1,15 +1,11 @@
 from ckeditor_uploader.widgets import CKEditorUploadingWidget
 from django import forms
-from django.forms.widgets import CheckboxInput
+from django.forms.widgets import CheckboxInput, DateTimeInput
-from django.forms.widgets import DateTimeInput
 from django.utils import timezone
 from django.utils.dates import MONTHS
 from taggit.models import Tag
 
-from .models import Event
+from .models import Event, FetMeeting, News, Post
-from .models import FetMeeting
-from .models import News
-from .models import Post
 
 
 class PostForm(forms.ModelForm):

fet2020/posts/mails.py

@@ -4,7 +4,6 @@ from django.conf import settings
 from django.core.mail import send_mail
 from html2text import html2text
 
-
 logger = logging.getLogger(__name__)
 
 

fet2020/posts/managers.py

@@ -1,9 +1,7 @@
 from datetime import timedelta
 
 from django.db import models
-from django.db.models import Case
+from django.db.models import Case, Q, When
-from django.db.models import Q
-from django.db.models import When
 from django.utils import timezone
 
 

fet2020/posts/models.py

@@ -13,18 +13,19 @@ from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from taggit.managers import TaggableManager
 
-from .managers import AllEventManager
-from .managers import ArticleManager
-from .managers import EventManager
-from .managers import FetMeetingManager
-from .managers import NewsManager
-from .managers import PostManager
 from core.models import CustomFlatPage
-from documents import create_pad
+from documents import create_pad, get_pad_html, set_pad_html
-from documents import get_pad_html
-from documents import set_pad_html
 from documents.api import get_pad_link
 
+from .managers import (
+    AllEventManager,
+    ArticleManager,
+    EventManager,
+    FetMeetingManager,
+    NewsManager,
+    PostManager,
+)
+
 logger = logging.getLogger(__name__)
 request_logger = logging.getLogger("django.request")
 

fet2020/posts/urls.py

@@ -1,10 +1,7 @@
-from django.urls import path
+from django.urls import path, re_path
-from django.urls import re_path
 
-from . import apps
+from . import apps, views
-from . import views
+from .utils import slug_calc, tag_complete
-from .utils import slug_calc
-from .utils import tag_complete
 
 app_name = apps.PostsConfig.name
 

fet2020/posts/utils.py

@@ -1,8 +1,6 @@
 from io import BytesIO
 
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseServerError, JsonResponse
-from django.http import HttpResponseServerError
-from django.http import JsonResponse
 from django.utils import timezone
 from django.utils.text import slugify
 from taggit.models import Tag

fet2020/posts/views.py

@@ -2,30 +2,27 @@ import logging
 
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import Http404
+from django.http import Http404, HttpResponse
-from django.http import HttpResponse
 from django.shortcuts import render
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.views.generic.detail import DetailView
-from django.views.generic.edit import CreateView
+from django.views.generic.edit import CreateView, UpdateView
-from django.views.generic.edit import UpdateView
 
-from .forms import EventUpdateForm
-from .forms import FetMeetingCreateForm
-from .forms import FetMeetingUpdateForm
-from .forms import NewsUpdateForm
-from .forms import PostSearchForm
-from .models import Event
-from .models import FetMeeting
-from .models import FileUpload
-from .models import Post
-from .utils import render_to_pdf
 from authentications.decorators import authenticated_user
 from documents.etherpadlib import add_ep_cookie
 from fet2020.utils import add_log_action
 from members.models import Member
 
+from .forms import (
+    EventUpdateForm,
+    FetMeetingCreateForm,
+    FetMeetingUpdateForm,
+    NewsUpdateForm,
+    PostSearchForm,
+)
+from .models import Event, FetMeeting, FileUpload, Post
+from .utils import render_to_pdf
 
 logger = logging.getLogger(__name__)
 

fet2020/posts/viewsets.py

@@ -1,8 +1,7 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import viewsets
 
-from .models import FetMeeting
+from .models import FetMeeting, Post
-from .models import Post
 from .serializers import PostSerializer
 
 

fet2020/search/urls.py

@@ -1,8 +1,6 @@
-from django.urls import path
+from django.urls import path, re_path
-from django.urls import re_path
 
-from . import apps
+from . import apps, views
-from . import views
 
 app_name = apps.SearchConfig.name
 

fet2020/search/views.py

@@ -3,10 +3,10 @@ from django.shortcuts import render
 from haystack.generic_views import SearchView
 from haystack.query import SearchQuerySet
 
-from .forms import FetUserSearchForm
-from .forms import NonUserSearchForm
 from authentications.decorators import authenticated_user
 
+from .forms import FetUserSearchForm, NonUserSearchForm
+
 
 class FetUserSearchView(LoginRequiredMixin, SearchView):
     template_name = "search/index.html"

fet2020/tasks/admin.py

@@ -1,11 +1,7 @@
 from django.contrib import admin
 
-from .forms import DocumentInlineForm
+from .forms import DocumentInlineForm, TaskAdminForm, TaskListAdminForm
-from .forms import TaskAdminForm
+from .models import Document, Task, TaskList
-from .forms import TaskListAdminForm
-from .models import Document
-from .models import Task
-from .models import TaskList
 
 
 class DocumentInline(admin.TabularInline):

fet2020/tasks/forms.py

@@ -6,9 +6,7 @@ from django.core.validators import ValidationError
 from django.forms.widgets import HiddenInput
 from django.utils import timezone
 
-from .models import Document
+from .models import Document, Task, TaskList
-from .models import Task
-from .models import TaskList
 
 
 class DateInput(forms.DateInput):

fet2020/tasks/models.py

@@ -10,11 +10,12 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.text import slugify
 
-from .managers import TaskManager
 from documents import create_pad
 from documents.api import get_pad_link
 from fet2020.utils import create_random_id
 
+from .managers import TaskManager
+
 
 class TaskList(models.Model):
     name = models.CharField(max_length=128)

fet2020/tasks/urls.py

@@ -1,12 +1,7 @@
 from django.urls import path
 
-from . import apps
+from . import apps, views
-from . import views
+from .views import DocumentCreateView, TaskCreateView, TaskDetailView, TaskUpdateView
-from .views import DocumentCreateView
-from .views import TaskCreateView
-from .views import TaskDetailView
-from .views import TaskUpdateView
-
 
 app_name = apps.TasksConfig.name
 

fet2020/tasks/views.py

@@ -5,25 +5,20 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import render
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
-from django.urls import reverse_lazy
 from django.utils import timezone
 from django.views.generic.detail import DetailView
-from django.views.generic.edit import CreateView
+from django.views.generic.edit import CreateView, UpdateView
-from django.views.generic.edit import UpdateView
 
-from .forms import DocumentCreateForm
-from .forms import TaskCreateForm
-from .forms import TaskUpdateForm
-from .models import Document
-from .models import Task
-from .models import TaskList
 from authentications.decorators import authenticated_user
 from documents.api import get_pad_link
 from documents.etherpadlib import add_ep_cookie
 from fet2020.utils import add_log_action
 from intern.models import Topic
 
+from .forms import DocumentCreateForm, TaskCreateForm, TaskUpdateForm
+from .models import Document, Task, TaskList
+
 logger = logging.getLogger(__name__)
 
 

fet2020/tests/test_etherpad.py

@@ -4,8 +4,7 @@ import pytest
 from django.core.validators import ValidationError
 from django.urls import reverse
 
-from documents.api import createPadifNotExists
+from documents.api import createPadifNotExists, ep_client
-from documents.api import ep_client
 
 
 class TestEtherpad:

fet2020/tests/test_posts.py

@@ -8,10 +8,7 @@ import pytest
 from django.core.validators import ValidationError
 from django.urls import reverse
 
-from posts.models import Event
+from posts.models import Event, FetMeeting, News, Post
-from posts.models import FetMeeting
-from posts.models import News
-from posts.models import Post
 
 
 def get_random_string(size):