From 2b3302d9c45bab6383803a20efc36f7820895f05 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 9 Jan 2023 18:22:26 +0000 Subject: [PATCH] isort formatting then black formatting --- fet2020/authentications/authentications.py | 5 +--- fet2020/authentications/forms.py | 6 ++--- fet2020/authentications/urls.py | 3 +-- fet2020/authentications/views.py | 17 ++++++------ fet2020/blackboard/models.py | 1 - fet2020/blackboard/urls.py | 3 +-- fet2020/core/admin.py | 3 +-- fet2020/documents/__init__.py | 4 +-- fet2020/documents/api.py | 4 +-- fet2020/documents/etherpadlib.py | 3 ++- fet2020/fet2020/urls.py | 21 ++++++++------- fet2020/fet2020/utils.py | 4 +-- fet2020/fet2020/views.py | 4 +-- fet2020/gallery/urls.py | 3 +-- fet2020/gallery/utils.py | 5 +--- fet2020/gallery/views.py | 6 ++--- fet2020/intern/admin.py | 26 +++++++++---------- fet2020/intern/forms.py | 10 +++----- fet2020/intern/models.py | 3 +-- fet2020/intern/urls.py | 27 ++++++++++--------- fet2020/intern/views.py | 30 ++++++++++------------ fet2020/members/admin.py | 10 ++------ fet2020/members/forms.py | 4 +-- fet2020/members/models.py | 23 +++++++++-------- fet2020/members/serializers.py | 5 +--- fet2020/members/tests.py | 9 ++----- fet2020/members/urls.py | 3 +-- fet2020/members/validators.py | 3 +-- fet2020/members/views.py | 4 +-- fet2020/members/viewsets.py | 15 +++++------ fet2020/posts/admin.py | 15 +++-------- fet2020/posts/cronjobs.py | 1 - fet2020/posts/forms.py | 8 ++---- fet2020/posts/mails.py | 1 - fet2020/posts/managers.py | 4 +-- fet2020/posts/models.py | 19 +++++++------- fet2020/posts/urls.py | 9 +++---- fet2020/posts/utils.py | 4 +-- fet2020/posts/views.py | 25 ++++++++---------- fet2020/posts/viewsets.py | 3 +-- fet2020/search/urls.py | 6 ++--- fet2020/search/views.py | 4 +-- fet2020/tasks/admin.py | 8 ++---- fet2020/tasks/forms.py | 4 +-- fet2020/tasks/models.py | 3 ++- fet2020/tasks/urls.py | 9 ++----- fet2020/tasks/views.py | 15 ++++------- fet2020/tests/test_etherpad.py | 3 +-- fet2020/tests/test_posts.py | 5 +--- 49 files changed, 158 insertions(+), 252 deletions(-) diff --git a/fet2020/authentications/authentications.py b/fet2020/authentications/authentications.py index 49b778a1..e8dd687f 100644 --- a/fet2020/authentications/authentications.py +++ b/fet2020/authentications/authentications.py @@ -1,9 +1,6 @@ import logging -from ldap3 import Connection -from ldap3 import HASHED_SALTED_SHA -from ldap3 import MODIFY_REPLACE -from ldap3 import Server +from ldap3 import HASHED_SALTED_SHA, MODIFY_REPLACE, Connection, Server from ldap3.core.exceptions import LDAPBindError from ldap3.utils.hashed import hashed diff --git a/fet2020/authentications/forms.py b/fet2020/authentications/forms.py index a332f8f8..c340a8d8 100644 --- a/fet2020/authentications/forms.py +++ b/fet2020/authentications/forms.py @@ -1,10 +1,8 @@ -from django.contrib.auth.forms import AuthenticationForm -from django.contrib.auth.forms import PasswordChangeForm +from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm from django.contrib.auth.models import User from django.core.validators import ValidationError -from .authentications import authentication -from .authentications import change_password +from .authentications import authentication, change_password class LoginForm(AuthenticationForm): diff --git a/fet2020/authentications/urls.py b/fet2020/authentications/urls.py index db1c9464..addf6232 100644 --- a/fet2020/authentications/urls.py +++ b/fet2020/authentications/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import apps -from . import views +from . import apps, views app_name = apps.AuthenticationsConfig.name diff --git a/fet2020/authentications/views.py b/fet2020/authentications/views.py index 49dac292..71942ff4 100644 --- a/fet2020/authentications/views.py +++ b/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 PasswordChangeDoneView -from django.contrib.auth.views import PasswordChangeView +from django.contrib.auth.views import ( + LoginView, + PasswordChangeDoneView, + PasswordChangeView, +) from django.shortcuts import redirect -from django.urls import reverse -from django.urls import reverse_lazy +from django.urls import reverse, reverse_lazy + +from documents.etherpadlib import del_ep_cookie from .decorators import authenticated_user -from .forms import LdapPasswordChangeForm -from .forms import LoginForm -from documents.etherpadlib import del_ep_cookie +from .forms import LdapPasswordChangeForm, LoginForm class AuthLoginView(LoginView): diff --git a/fet2020/blackboard/models.py b/fet2020/blackboard/models.py index e028e29a..00290541 100644 --- a/fet2020/blackboard/models.py +++ b/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") diff --git a/fet2020/blackboard/urls.py b/fet2020/blackboard/urls.py index 1f854ede..67e6d0df 100644 --- a/fet2020/blackboard/urls.py +++ b/fet2020/blackboard/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import apps -from . import views +from . import apps, views app_name = apps.BlackboardConfig.name diff --git a/fet2020/core/admin.py b/fet2020/core/admin.py index d1ba3213..5ea044dc 100644 --- a/fet2020/core/admin.py +++ b/fet2020/core/admin.py @@ -1,6 +1,5 @@ import taggit.admin -from django.contrib import admin -from django.contrib import auth +from django.contrib import admin, auth from django.contrib.flatpages.admin import FlatPageAdmin from django.contrib.flatpages.models import FlatPage from django.contrib.sites.models import Site diff --git a/fet2020/documents/__init__.py b/fet2020/documents/__init__.py index 220bb0e4..ae1381b8 100644 --- a/fet2020/documents/__init__.py +++ b/fet2020/documents/__init__.py @@ -1,3 +1 @@ -from .api import create_pad -from .api import get_pad_html -from .api import set_pad_html +from .api import create_pad, get_pad_html, set_pad_html diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py index 5e929d68..d9ea4127 100644 --- a/fet2020/documents/api.py +++ b/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 EtherpadLiteClient - +from etherpad_lite import EtherpadException, EtherpadLiteClient logger = logging.getLogger(__name__) diff --git a/fet2020/documents/etherpadlib.py b/fet2020/documents/etherpadlib.py index e44b7395..29c303d6 100644 --- a/fet2020/documents/etherpadlib.py +++ b/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): diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index 270255b1..cde5b265 100644 --- a/fet2020/fet2020/urls.py +++ b/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 flatpages +from django.contrib import admin, flatpages from django.contrib.sitemaps.views import sitemap -from django.urls import include -from django.urls import path -from django.urls import re_path +from django.urls import include, path, re_path from django.views.generic import RedirectView from rest_framework import routers -from . import views -from .sitemaps import sitemaps -from members.viewsets import JobGroupViewSet -from members.viewsets import JobMemberViewSet -from members.viewsets import JobViewSet -from members.viewsets import MemberViewSet +from members.viewsets import ( + JobGroupViewSet, + JobMemberViewSet, + JobViewSet, + MemberViewSet, +) from posts.viewsets import PostViewSet +from . import views +from .sitemaps import sitemaps router = routers.DefaultRouter() router.register(r"posts", PostViewSet) diff --git a/fet2020/fet2020/utils.py b/fet2020/fet2020/utils.py index d07b4855..221f8073 100644 --- a/fet2020/fet2020/utils.py +++ b/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 CHANGE -from django.contrib.admin.models import LogEntry +from django.contrib.admin.models import ADDITION, CHANGE, LogEntry from django.contrib.admin.utils import construct_change_message from django.contrib.contenttypes.models import ContentType diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py index e2f88ac0..6f8ff96b 100644 --- a/fet2020/fet2020/views.py +++ b/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 FetMeeting -from posts.models import Post +from posts.models import Event, FetMeeting, Post def index(request): diff --git a/fet2020/gallery/urls.py b/fet2020/gallery/urls.py index d99322c5..9f677242 100644 --- a/fet2020/gallery/urls.py +++ b/fet2020/gallery/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import apps -from . import views +from . import apps, views app_name = apps.GalleryConfig.name diff --git a/fet2020/gallery/utils.py b/fet2020/gallery/utils.py index 6ebee804..8ac7b21f 100644 --- a/fet2020/gallery/utils.py +++ b/fet2020/gallery/utils.py @@ -2,10 +2,7 @@ import logging import os from django.conf import settings -from PIL import ExifTags -from PIL import Image -from PIL import ImageOps - +from PIL import ExifTags, Image, ImageOps gallery_path = settings.GALLERY["path"] gallery_thumb_path = settings.GALLERY["thumb_path"] diff --git a/fet2020/gallery/views.py b/fet2020/gallery/views.py index f709e5fd..1f3b0f7a 100644 --- a/fet2020/gallery/views.py +++ b/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: diff --git a/fet2020/intern/admin.py b/fet2020/intern/admin.py index 479a669c..d15a42d4 100644 --- a/fet2020/intern/admin.py +++ b/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 AttachmentInlineForm -from .forms import EtherpadAdminForm -from .forms import EtherpadInlineForm -from .forms import FileUploadAdminForm -from .forms import FileUploadInlineForm -from .forms import TopicAdminForm -from .forms import TopicGroupAdminForm -from .forms import TopicInlineForm -from .models import Attachment -from .models import Etherpad -from .models import FileUpload -from .models import Topic -from .models import TopicGroup +from .forms import ( + AttachmentAdminForm, + AttachmentInlineForm, + EtherpadAdminForm, + EtherpadInlineForm, + FileUploadAdminForm, + FileUploadInlineForm, + TopicAdminForm, + TopicGroupAdminForm, + TopicInlineForm, +) +from .models import Attachment, Etherpad, FileUpload, Topic, TopicGroup class TopicInline(admin.TabularInline): diff --git a/fet2020/intern/forms.py b/fet2020/intern/forms.py index 2c5f19d1..0a802a87 100644 --- a/fet2020/intern/forms.py +++ b/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 .models import Etherpad -from .models import FileUpload -from .models import Topic -from .models import TopicGroup -from tasks.models import Task -from tasks.models import TaskList +from tasks.models import Task, TaskList + +from .models import Attachment, Etherpad, FileUpload, Topic, TopicGroup class DateInput(forms.DateInput): diff --git a/fet2020/intern/models.py b/fet2020/intern/models.py index 82736588..0d2072bb 100644 --- a/fet2020/intern/models.py +++ b/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 get_pad_html +from documents import create_pad, get_pad_html from documents.api import get_pad_link from fet2020.utils import create_random_id from tasks.models import TaskList diff --git a/fet2020/intern/urls.py b/fet2020/intern/urls.py index 9295f18b..66d4ee13 100644 --- a/fet2020/intern/urls.py +++ b/fet2020/intern/urls.py @@ -1,18 +1,17 @@ -from django.urls import include -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 django.urls import include, path +from . import apps, views +from .views import ( + AttachmentCreateView, + AttachmentDetailView, + AttachmentUpdateView, + EtherpadCreateView, + FileUploadCreateView, + TaskCreateView, + TopicCreateView, + TopicDetailView, + TopicUpdateView, +) app_name = apps.InternConfig.name diff --git a/fet2020/intern/views.py b/fet2020/intern/views.py index b8b356b7..f77ad5f2 100644 --- a/fet2020/intern/views.py +++ b/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 Q +from django.db.models import F, Q from django.shortcuts import render -from django.urls import reverse -from django.urls import reverse_lazy +from django.urls import reverse, reverse_lazy from django.views.generic.detail import DetailView -from django.views.generic.edit import CreateView -from django.views.generic.edit import UpdateView +from django.views.generic.edit import CreateView, 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__) diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py index 1fa719f9..bb09f9d6 100644 --- a/fet2020/members/admin.py +++ b/fet2020/members/admin.py @@ -1,13 +1,7 @@ from django.contrib import admin -from .forms import JobForm -from .forms import JobGroupForm -from .forms import JobInlineForm -from .forms import MemberForm -from .models import Job -from .models import JobGroup -from .models import JobMember -from .models import Member +from .forms import JobForm, JobGroupForm, JobInlineForm, MemberForm +from .models import Job, JobGroup, JobMember, Member class MemberRoleFilter(admin.SimpleListFilter): diff --git a/fet2020/members/forms.py b/fet2020/members/forms.py index 994ef4d1..6eed6372 100644 --- a/fet2020/members/forms.py +++ b/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 JobGroup -from .models import Member +from .models import Job, JobGroup, Member class JobInlineForm(forms.ModelForm): diff --git a/fet2020/members/models.py b/fet2020/members/models.py index 233bbd16..da88571e 100644 --- a/fet2020/members/models.py +++ b/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 +from django.core.validators import ValidationError, validate_email 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 InactiveJobMemberManager -from .managers import JobMemberManager -from .managers import MemberManager -from .validators import PhoneNumberValidator -from .validators import validate_domainonly_email -from .validators import validate_file_size -from .validators import validate_image_dimension +from .managers import ( + ActiveJobMemberManager, + InactiveJobMemberManager, + JobMemberManager, + MemberManager, +) +from .validators import ( + PhoneNumberValidator, + validate_domainonly_email, + validate_file_size, + validate_image_dimension, +) logger = logging.getLogger(__name__) diff --git a/fet2020/members/serializers.py b/fet2020/members/serializers.py index 4278be81..f7bbf1ac 100644 --- a/fet2020/members/serializers.py +++ b/fet2020/members/serializers.py @@ -1,9 +1,6 @@ from rest_framework import serializers -from .models import Job -from .models import JobGroup -from .models import JobMember -from .models import Member +from .models import Job, JobGroup, JobMember, Member class MemberSerializer(serializers.HyperlinkedModelSerializer): diff --git a/fet2020/members/tests.py b/fet2020/members/tests.py index 0d121543..96e1f12a 100644 --- a/fet2020/members/tests.py +++ b/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 JobGroupForm -from .forms import MemberForm -from .models import Job -from .models import JobGroup -from .models import Member - +from .forms import JobForm, JobGroupForm, MemberForm +from .models import Job, JobGroup, Member image_path = os.path.join(os.path.dirname(__file__), "tests/files/peter.jpg") diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py index e3aeed68..a8c6c596 100644 --- a/fet2020/members/urls.py +++ b/fet2020/members/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import apps -from . import views +from . import apps, views app_name = apps.MembersConfig.name diff --git a/fet2020/members/validators.py b/fet2020/members/validators.py index 84c03c5f..159c95c5 100644 --- a/fet2020/members/validators.py +++ b/fet2020/members/validators.py @@ -1,5 +1,4 @@ -from django.core.validators import RegexValidator -from django.core.validators import ValidationError +from django.core.validators import RegexValidator, ValidationError from django.utils.deconstruct import deconstructible diff --git a/fet2020/members/views.py b/fet2020/members/views.py index 88adf7b0..11915fd0 100644 --- a/fet2020/members/views.py +++ b/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 JobMember -from .models import Member +from .models import JobGroup, JobMember, Member logger = logging.getLogger(__name__) diff --git a/fet2020/members/viewsets.py b/fet2020/members/viewsets.py index 3b231c2b..fc3af237 100644 --- a/fet2020/members/viewsets.py +++ b/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 JobGroup -from .models import JobMember -from .models import Member -from .serializers import JobGroupSerializer -from .serializers import JobMemberSerializer -from .serializers import JobSerializer -from .serializers import MemberSerializer +from .models import Job, JobGroup, JobMember, Member +from .serializers import ( + JobGroupSerializer, + JobMemberSerializer, + JobSerializer, + MemberSerializer, +) class MemberViewSet(viewsets.ModelViewSet): diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py index ff5d2278..300065f1 100644 --- a/fet2020/posts/admin.py +++ b/fet2020/posts/admin.py @@ -1,17 +1,10 @@ -from django.contrib import admin -from django.contrib import messages +from django.contrib import admin, 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() diff --git a/fet2020/posts/cronjobs.py b/fet2020/posts/cronjobs.py index 32d8a45f..a7f1ebc9 100644 --- a/fet2020/posts/cronjobs.py +++ b/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__) diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py index 841f3bc0..61e1749d 100644 --- a/fet2020/posts/forms.py +++ b/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 DateTimeInput +from django.forms.widgets import CheckboxInput, DateTimeInput from django.utils import timezone from django.utils.dates import MONTHS from taggit.models import Tag -from .models import Event -from .models import FetMeeting -from .models import News -from .models import Post +from .models import Event, FetMeeting, News, Post class PostForm(forms.ModelForm): diff --git a/fet2020/posts/mails.py b/fet2020/posts/mails.py index c671e6c6..ce40c301 100644 --- a/fet2020/posts/mails.py +++ b/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__) diff --git a/fet2020/posts/managers.py b/fet2020/posts/managers.py index 23880f9e..82d28cc9 100644 --- a/fet2020/posts/managers.py +++ b/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 Q -from django.db.models import When +from django.db.models import Case, Q, When from django.utils import timezone diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index 93c1c501..40e4a8e6 100644 --- a/fet2020/posts/models.py +++ b/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 get_pad_html -from documents import set_pad_html +from documents import create_pad, get_pad_html, 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") diff --git a/fet2020/posts/urls.py b/fet2020/posts/urls.py index 89ec1030..2ec752b9 100644 --- a/fet2020/posts/urls.py +++ b/fet2020/posts/urls.py @@ -1,10 +1,7 @@ -from django.urls import path -from django.urls import re_path +from django.urls import path, re_path -from . import apps -from . import views -from .utils import slug_calc -from .utils import tag_complete +from . import apps, views +from .utils import slug_calc, tag_complete app_name = apps.PostsConfig.name diff --git a/fet2020/posts/utils.py b/fet2020/posts/utils.py index e472d942..f48353d2 100644 --- a/fet2020/posts/utils.py +++ b/fet2020/posts/utils.py @@ -1,8 +1,6 @@ from io import BytesIO -from django.http import HttpResponse -from django.http import HttpResponseServerError -from django.http import JsonResponse +from django.http import HttpResponse, HttpResponseServerError, JsonResponse from django.utils import timezone from django.utils.text import slugify from taggit.models import Tag diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index e5780718..caceddb3 100644 --- a/fet2020/posts/views.py +++ b/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 HttpResponse +from django.http import Http404, 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 UpdateView +from django.views.generic.edit import CreateView, 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__) diff --git a/fet2020/posts/viewsets.py b/fet2020/posts/viewsets.py index 54799067..3ed68fd9 100644 --- a/fet2020/posts/viewsets.py +++ b/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 Post +from .models import FetMeeting, Post from .serializers import PostSerializer diff --git a/fet2020/search/urls.py b/fet2020/search/urls.py index 3bfdf851..71f155d6 100644 --- a/fet2020/search/urls.py +++ b/fet2020/search/urls.py @@ -1,8 +1,6 @@ -from django.urls import path -from django.urls import re_path +from django.urls import path, re_path -from . import apps -from . import views +from . import apps, views app_name = apps.SearchConfig.name diff --git a/fet2020/search/views.py b/fet2020/search/views.py index 8aa2eadd..85c4ccfd 100644 --- a/fet2020/search/views.py +++ b/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" diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py index a6cd99c2..813ab541 100644 --- a/fet2020/tasks/admin.py +++ b/fet2020/tasks/admin.py @@ -1,11 +1,7 @@ from django.contrib import admin -from .forms import DocumentInlineForm -from .forms import TaskAdminForm -from .forms import TaskListAdminForm -from .models import Document -from .models import Task -from .models import TaskList +from .forms import DocumentInlineForm, TaskAdminForm, TaskListAdminForm +from .models import Document, Task, TaskList class DocumentInline(admin.TabularInline): diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py index badd8fb0..67fee02d 100644 --- a/fet2020/tasks/forms.py +++ b/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 Task -from .models import TaskList +from .models import Document, Task, TaskList class DateInput(forms.DateInput): diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py index cc7ef2e5..a1fa2d81 100644 --- a/fet2020/tasks/models.py +++ b/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) diff --git a/fet2020/tasks/urls.py b/fet2020/tasks/urls.py index be371a08..578c9291 100644 --- a/fet2020/tasks/urls.py +++ b/fet2020/tasks/urls.py @@ -1,12 +1,7 @@ from django.urls import path -from . import apps -from . import views -from .views import DocumentCreateView -from .views import TaskCreateView -from .views import TaskDetailView -from .views import TaskUpdateView - +from . import apps, views +from .views import DocumentCreateView, TaskCreateView, TaskDetailView, TaskUpdateView app_name = apps.TasksConfig.name diff --git a/fet2020/tasks/views.py b/fet2020/tasks/views.py index d7567ada..d073edaa 100644 --- a/fet2020/tasks/views.py +++ b/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_lazy +from django.urls import reverse, 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 UpdateView +from django.views.generic.edit import CreateView, 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__) diff --git a/fet2020/tests/test_etherpad.py b/fet2020/tests/test_etherpad.py index e0b0da66..1d601823 100644 --- a/fet2020/tests/test_etherpad.py +++ b/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 ep_client +from documents.api import createPadifNotExists, ep_client class TestEtherpad: diff --git a/fet2020/tests/test_posts.py b/fet2020/tests/test_posts.py index bad19cbc..112cec92 100644 --- a/fet2020/tests/test_posts.py +++ b/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 FetMeeting -from posts.models import News -from posts.models import Post +from posts.models import Event, FetMeeting, News, Post def get_random_string(size):