From eca6d68dc3001cb1f3600e5804ad15741af88530 Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 9 Jan 2023 16:34:02 +0000 Subject: [PATCH] Reordering imports --- fet2020/authentications/authentications.py | 5 ++- fet2020/authentications/forms.py | 6 ++-- fet2020/authentications/views.py | 18 +++++------ fet2020/core/admin.py | 4 +-- fet2020/core/forms.py | 1 - fet2020/documents/__init__.py | 4 ++- fet2020/documents/api.py | 4 +-- fet2020/documents/etherpadlib.py | 2 +- fet2020/fet2020/settings.py | 3 +- fet2020/fet2020/urls.py | 22 ++++++------- fet2020/fet2020/utils.py | 4 ++- fet2020/fet2020/views.py | 4 ++- fet2020/gallery/search_indexes.py | 3 +- fet2020/gallery/utils.py | 4 ++- fet2020/gallery/views.py | 5 +-- fet2020/intern/admin.py | 26 ++++++++------- fet2020/intern/forms.py | 10 ++++-- fet2020/intern/models.py | 3 +- fet2020/intern/urls.py | 23 +++++++------- fet2020/intern/views.py | 37 ++++++++++++---------- fet2020/members/admin.py | 10 ++++-- fet2020/members/forms.py | 5 +-- fet2020/members/models.py | 26 +++++++-------- fet2020/members/serializers.py | 5 ++- fet2020/members/tests.py | 8 +++-- fet2020/members/validators.py | 3 +- fet2020/members/views.py | 4 ++- fet2020/members/viewsets.py | 15 +++++---- fet2020/posts/admin.py | 14 ++++++-- fet2020/posts/cronjobs.py | 2 +- fet2020/posts/forms.py | 11 ++++--- fet2020/posts/mails.py | 3 +- fet2020/posts/managers.py | 10 +++--- fet2020/posts/models.py | 21 ++++++------ fet2020/posts/urls.py | 6 ++-- fet2020/posts/utils.py | 9 +++--- fet2020/posts/views.py | 25 ++++++++------- fet2020/posts/viewsets.py | 3 +- fet2020/search/urls.py | 3 +- fet2020/search/views.py | 8 ++--- fet2020/tasks/admin.py | 8 +++-- fet2020/tasks/forms.py | 5 +-- fet2020/tasks/models.py | 2 +- fet2020/tasks/urls.py | 5 ++- fet2020/tasks/views.py | 17 ++++++---- fet2020/tests/test_etherpad.py | 11 ++++--- fet2020/tests/test_posts.py | 15 ++++++--- 47 files changed, 259 insertions(+), 183 deletions(-) diff --git a/fet2020/authentications/authentications.py b/fet2020/authentications/authentications.py index 6ec441f9..49b778a1 100644 --- a/fet2020/authentications/authentications.py +++ b/fet2020/authentications/authentications.py @@ -1,6 +1,9 @@ import logging -from ldap3 import Server, Connection, HASHED_SALTED_SHA, MODIFY_REPLACE +from ldap3 import Connection +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 diff --git a/fet2020/authentications/forms.py b/fet2020/authentications/forms.py index c340a8d8..a332f8f8 100644 --- a/fet2020/authentications/forms.py +++ b/fet2020/authentications/forms.py @@ -1,8 +1,10 @@ -from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm +from django.contrib.auth.forms import AuthenticationForm +from django.contrib.auth.forms import PasswordChangeForm from django.contrib.auth.models import User from django.core.validators import ValidationError -from .authentications import authentication, change_password +from .authentications import authentication +from .authentications import change_password class LoginForm(AuthenticationForm): diff --git a/fet2020/authentications/views.py b/fet2020/authentications/views.py index 97d726dd..49dac292 100644 --- a/fet2020/authentications/views.py +++ b/fet2020/authentications/views.py @@ -1,17 +1,15 @@ from django.contrib.auth import logout -from django.contrib.auth.views import ( - LoginView, - PasswordChangeDoneView, - PasswordChangeView, -) +from django.contrib.auth.views import LoginView +from django.contrib.auth.views import PasswordChangeDoneView +from django.contrib.auth.views import PasswordChangeView from django.shortcuts import redirect - -from documents.etherpadlib import del_ep_cookie +from django.urls import reverse +from django.urls import reverse_lazy from .decorators import authenticated_user -from .forms import LdapPasswordChangeForm, LoginForm - -from django.urls import reverse_lazy, reverse +from .forms import LdapPasswordChangeForm +from .forms import LoginForm +from documents.etherpadlib import del_ep_cookie class AuthLoginView(LoginView): diff --git a/fet2020/core/admin.py b/fet2020/core/admin.py index 503f93a8..d1ba3213 100644 --- a/fet2020/core/admin.py +++ b/fet2020/core/admin.py @@ -1,6 +1,6 @@ import taggit.admin - -from django.contrib import admin, auth +from django.contrib import admin +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 diff --git a/fet2020/core/forms.py b/fet2020/core/forms.py index 099d4297..1eb7d3f0 100644 --- a/fet2020/core/forms.py +++ b/fet2020/core/forms.py @@ -1,5 +1,4 @@ from ckeditor_uploader.widgets import CKEditorUploadingWidget - from django import forms from .models import CustomFlatPage diff --git a/fet2020/documents/__init__.py b/fet2020/documents/__init__.py index ae1381b8..220bb0e4 100644 --- a/fet2020/documents/__init__.py +++ b/fet2020/documents/__init__.py @@ -1 +1,3 @@ -from .api import create_pad, get_pad_html, set_pad_html +from .api import create_pad +from .api import get_pad_html +from .api import set_pad_html diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py index b06b63b4..5e929d68 100644 --- a/fet2020/documents/api.py +++ b/fet2020/documents/api.py @@ -3,9 +3,9 @@ import os from contextlib import contextmanager from urllib.parse import urljoin -from etherpad_lite import EtherpadLiteClient, EtherpadException - from django.conf import settings +from etherpad_lite import EtherpadException +from etherpad_lite import EtherpadLiteClient logger = logging.getLogger(__name__) diff --git a/fet2020/documents/etherpadlib.py b/fet2020/documents/etherpadlib.py index bc82c2b7..e44b7395 100644 --- a/fet2020/documents/etherpadlib.py +++ b/fet2020/documents/etherpadlib.py @@ -3,8 +3,8 @@ from datetime import timedelta from django.conf import settings from django.utils import timezone -from authentications.decorators import ep_authenticated_user from .api import get_ep_client +from authentications.decorators import ep_authenticated_user @ep_authenticated_user diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 6bec15a0..199f335b 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -1,7 +1,8 @@ -import environ import os from urllib.parse import urljoin +import environ + env = environ.Env( # set casting, default value DEBUG=(bool, True), diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index 9af7f0f5..270255b1 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -1,21 +1,21 @@ -from rest_framework import routers - from django.conf import settings from django.conf.urls.static import static -from django.contrib import admin, flatpages +from django.contrib import admin +from django.contrib import flatpages from django.contrib.sitemaps.views import sitemap -from django.urls import include, path, re_path +from django.urls import include +from django.urls import path +from django.urls import re_path from django.views.generic import RedirectView +from rest_framework import routers -from posts.viewsets import PostViewSet -from members.viewsets import ( - MemberViewSet, - JobViewSet, - JobGroupViewSet, - JobMemberViewSet, -) 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 posts.viewsets import PostViewSet router = routers.DefaultRouter() diff --git a/fet2020/fet2020/utils.py b/fet2020/fet2020/utils.py index 221f8073..d07b4855 100644 --- a/fet2020/fet2020/utils.py +++ b/fet2020/fet2020/utils.py @@ -1,7 +1,9 @@ # util functions for all apps import uuid -from django.contrib.admin.models import ADDITION, CHANGE, LogEntry +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.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 99189d40..e2f88ac0 100644 --- a/fet2020/fet2020/views.py +++ b/fet2020/fet2020/views.py @@ -2,7 +2,9 @@ from collections import deque from django.shortcuts import render -from posts.models import Post, FetMeeting, Event +from posts.models import Event +from posts.models import FetMeeting +from posts.models import Post def index(request): diff --git a/fet2020/gallery/search_indexes.py b/fet2020/gallery/search_indexes.py index 37f99366..095a9091 100644 --- a/fet2020/gallery/search_indexes.py +++ b/fet2020/gallery/search_indexes.py @@ -1,6 +1,5 @@ -from haystack import indexes - from django.utils import timezone +from haystack import indexes from .models import Album diff --git a/fet2020/gallery/utils.py b/fet2020/gallery/utils.py index 32ee213b..6ebee804 100644 --- a/fet2020/gallery/utils.py +++ b/fet2020/gallery/utils.py @@ -1,8 +1,10 @@ import logging import os -from PIL import Image, ExifTags, ImageOps from django.conf import settings +from PIL import ExifTags +from PIL import Image +from PIL import ImageOps gallery_path = settings.GALLERY["path"] diff --git a/fet2020/gallery/views.py b/fet2020/gallery/views.py index 748fa262..f709e5fd 100644 --- a/fet2020/gallery/views.py +++ b/fet2020/gallery/views.py @@ -6,9 +6,10 @@ from django.http import Http404 from django.shortcuts import render from django.utils.text import slugify -from authentications.decorators import authenticated_user from .models import Album -from .utils import create_thumbs, get_folder_list +from .utils import create_thumbs +from .utils import get_folder_list +from authentications.decorators import authenticated_user def index(request): diff --git a/fet2020/intern/admin.py b/fet2020/intern/admin.py index 4249196c..479a669c 100644 --- a/fet2020/intern/admin.py +++ b/fet2020/intern/admin.py @@ -1,18 +1,20 @@ from django.contrib import admin from django.db.models import F -from .forms import ( - TopicGroupAdminForm, - TopicAdminForm, - AttachmentAdminForm, - EtherpadAdminForm, - FileUploadAdminForm, - TopicInlineForm, - AttachmentInlineForm, - EtherpadInlineForm, - FileUploadInlineForm, -) -from .models import TopicGroup, Topic, Attachment, Etherpad, FileUpload +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 class TopicInline(admin.TabularInline): diff --git a/fet2020/intern/forms.py b/fet2020/intern/forms.py index 0e8ae806..2c5f19d1 100644 --- a/fet2020/intern/forms.py +++ b/fet2020/intern/forms.py @@ -1,11 +1,15 @@ from ckeditor.widgets import CKEditorWidget from ckeditor_uploader.widgets import CKEditorUploadingWidget - from django import forms from django.forms.widgets import HiddenInput -from tasks.models import Task, TaskList -from .models import TopicGroup, Topic, Attachment, Etherpad, FileUpload +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 class DateInput(forms.DateInput): diff --git a/fet2020/intern/models.py b/fet2020/intern/models.py index 0d2072bb..82736588 100644 --- a/fet2020/intern/models.py +++ b/fet2020/intern/models.py @@ -9,7 +9,8 @@ from django.urls import reverse from django.utils import timezone from django.utils.text import slugify -from documents import create_pad, get_pad_html +from documents import create_pad +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 diff --git a/fet2020/intern/urls.py b/fet2020/intern/urls.py index 30c28da4..9295f18b 100644 --- a/fet2020/intern/urls.py +++ b/fet2020/intern/urls.py @@ -1,18 +1,17 @@ -from django.urls import include, path +from django.urls import include +from django.urls import path from . import apps from . import views -from .views import ( - AttachmentCreateView, - AttachmentDetailView, - AttachmentUpdateView, - EtherpadCreateView, - FileUploadCreateView, - TaskCreateView, - TopicCreateView, - TopicDetailView, - TopicUpdateView, -) +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 app_name = apps.InternConfig.name diff --git a/fet2020/intern/views.py b/fet2020/intern/views.py index 51053fee..b8b356b7 100644 --- a/fet2020/intern/views.py +++ b/fet2020/intern/views.py @@ -1,27 +1,32 @@ import logging - from collections import deque -from django.contrib.auth.mixins import LoginRequiredMixin -from django.db.models import F, Q -from django.shortcuts import render -from django.views.generic.detail import DetailView -from django.views.generic.edit import CreateView, UpdateView -from django.urls import reverse_lazy, reverse +from django.contrib.auth.mixins import LoginRequiredMixin +from django.db.models import F +from django.db.models import Q +from django.shortcuts import render +from django.urls import reverse +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 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 TopicGroup, Topic, Attachment, Etherpad, FileUpload logger = logging.getLogger(__name__) diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py index bb09f9d6..1fa719f9 100644 --- a/fet2020/members/admin.py +++ b/fet2020/members/admin.py @@ -1,7 +1,13 @@ from django.contrib import admin -from .forms import JobForm, JobGroupForm, JobInlineForm, MemberForm -from .models import Job, JobGroup, JobMember, Member +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 class MemberRoleFilter(admin.SimpleListFilter): diff --git a/fet2020/members/forms.py b/fet2020/members/forms.py index bb147e60..994ef4d1 100644 --- a/fet2020/members/forms.py +++ b/fet2020/members/forms.py @@ -1,8 +1,9 @@ from ckeditor_uploader.widgets import CKEditorUploadingWidget - from django import forms -from .models import Member, Job, JobGroup +from .models import Job +from .models import JobGroup +from .models import Member class JobInlineForm(forms.ModelForm): diff --git a/fet2020/members/models.py b/fet2020/members/models.py index 1982af49..233bbd16 100644 --- a/fet2020/members/models.py +++ b/fet2020/members/models.py @@ -1,25 +1,21 @@ import logging -from easy_thumbnails.fields import ThumbnailerImageField - from django.contrib.auth.models import User -from django.core.validators import ValidationError, validate_email +from django.core.validators import 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, - InactiveJobMemberManager, - JobMemberManager, - MemberManager, -) -from .validators import ( - PhoneNumberValidator, - validate_domainonly_email, - validate_file_size, - validate_image_dimension, -) +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 logger = logging.getLogger(__name__) diff --git a/fet2020/members/serializers.py b/fet2020/members/serializers.py index a15213d0..4278be81 100644 --- a/fet2020/members/serializers.py +++ b/fet2020/members/serializers.py @@ -1,6 +1,9 @@ from rest_framework import serializers -from .models import Member, Job, JobGroup, JobMember +from .models import Job +from .models import JobGroup +from .models import JobMember +from .models import Member class MemberSerializer(serializers.HyperlinkedModelSerializer): diff --git a/fet2020/members/tests.py b/fet2020/members/tests.py index 6fd3941b..0d121543 100644 --- a/fet2020/members/tests.py +++ b/fet2020/members/tests.py @@ -3,8 +3,12 @@ import os from django.core.files.uploadedfile import SimpleUploadedFile from django.test import TestCase -from .forms import JobForm, JobGroupForm, MemberForm -from .models import Job, JobGroup, Member +from .forms import JobForm +from .forms import JobGroupForm +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") diff --git a/fet2020/members/validators.py b/fet2020/members/validators.py index 159c95c5..84c03c5f 100644 --- a/fet2020/members/validators.py +++ b/fet2020/members/validators.py @@ -1,4 +1,5 @@ -from django.core.validators import RegexValidator, ValidationError +from django.core.validators import RegexValidator +from django.core.validators import ValidationError from django.utils.deconstruct import deconstructible diff --git a/fet2020/members/views.py b/fet2020/members/views.py index e2b2e1a7..88adf7b0 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -3,7 +3,9 @@ import logging from django.http import Http404 from django.shortcuts import render -from .models import Member, JobMember, JobGroup +from .models import JobGroup +from .models import JobMember +from .models import Member logger = logging.getLogger(__name__) diff --git a/fet2020/members/viewsets.py b/fet2020/members/viewsets.py index 41979293..3b231c2b 100644 --- a/fet2020/members/viewsets.py +++ b/fet2020/members/viewsets.py @@ -1,13 +1,14 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework import viewsets -from .models import Member, JobMember, JobGroup, Job -from .serializers import ( - MemberSerializer, - JobSerializer, - JobGroupSerializer, - JobMemberSerializer, -) +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 class MemberViewSet(viewsets.ModelViewSet): diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py index 70d52c67..ff5d2278 100644 --- a/fet2020/posts/admin.py +++ b/fet2020/posts/admin.py @@ -1,8 +1,16 @@ -from django.contrib import admin, messages +from django.contrib import admin +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): diff --git a/fet2020/posts/cronjobs.py b/fet2020/posts/cronjobs.py index 43e20b06..32d8a45f 100644 --- a/fet2020/posts/cronjobs.py +++ b/fet2020/posts/cronjobs.py @@ -7,8 +7,8 @@ from datetime import timedelta from django.utils import timezone -from .models import FetMeeting 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 9c13f2a2..841f3bc0 100644 --- a/fet2020/posts/forms.py +++ b/fet2020/posts/forms.py @@ -1,12 +1,15 @@ from ckeditor_uploader.widgets import CKEditorUploadingWidget -from taggit.models import Tag - from django import forms -from django.forms.widgets import CheckboxInput, DateTimeInput +from django.forms.widgets import CheckboxInput +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 Post, Event, News, FetMeeting +from .models import Event +from .models import FetMeeting +from .models import News +from .models import Post class PostForm(forms.ModelForm): diff --git a/fet2020/posts/mails.py b/fet2020/posts/mails.py index e800f722..c671e6c6 100644 --- a/fet2020/posts/mails.py +++ b/fet2020/posts/mails.py @@ -1,9 +1,8 @@ import logging -from html2text import html2text - 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 4c9a06c3..23880f9e 100644 --- a/fet2020/posts/managers.py +++ b/fet2020/posts/managers.py @@ -1,9 +1,11 @@ -from django.db import models -from django.db.models import Case, Q, When -from django.utils import timezone - 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.utils import timezone + class PublishedManager(models.Manager): def published(self, public=True): diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index 5276fc4c..93c1c501 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -2,8 +2,6 @@ import logging import re from datetime import timedelta -from taggit.managers import TaggableManager - from django.conf import settings from django.contrib.auth.models import User from django.core.validators import ValidationError @@ -13,18 +11,19 @@ from django.urls import reverse from django.utils import timezone 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, get_pad_html, set_pad_html +from documents import create_pad +from documents import get_pad_html +from documents import set_pad_html from documents.api import get_pad_link -from .managers import ( - PostManager, - ArticleManager, - NewsManager, - AllEventManager, - EventManager, - FetMeetingManager, -) logger = logging.getLogger(__name__) request_logger = logging.getLogger("django.request") diff --git a/fet2020/posts/urls.py b/fet2020/posts/urls.py index 4d9a6139..89ec1030 100644 --- a/fet2020/posts/urls.py +++ b/fet2020/posts/urls.py @@ -1,8 +1,10 @@ -from django.urls import path, re_path +from django.urls import path +from django.urls import re_path from . import apps 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 diff --git a/fet2020/posts/utils.py b/fet2020/posts/utils.py index d7f46531..e472d942 100644 --- a/fet2020/posts/utils.py +++ b/fet2020/posts/utils.py @@ -1,11 +1,12 @@ from io import BytesIO -from taggit.models import Tag -from xhtml2pdf import pisa - -from django.http import HttpResponse, JsonResponse, HttpResponseServerError +from django.http import HttpResponse +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 +from xhtml2pdf import pisa def render_to_pdf(html): diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index 1cbf2868..e5780718 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -2,26 +2,29 @@ import logging from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin -from django.http import HttpResponse, Http404 +from django.http import Http404 +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.edit import CreateView, UpdateView from django.views.generic.detail import DetailView +from django.views.generic.edit import CreateView +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__) diff --git a/fet2020/posts/viewsets.py b/fet2020/posts/viewsets.py index 90a87ea2..54799067 100644 --- a/fet2020/posts/viewsets.py +++ b/fet2020/posts/viewsets.py @@ -1,7 +1,8 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework import viewsets -from .models import Post, FetMeeting +from .models import FetMeeting +from .models import Post from .serializers import PostSerializer diff --git a/fet2020/search/urls.py b/fet2020/search/urls.py index 7ff59069..3bfdf851 100644 --- a/fet2020/search/urls.py +++ b/fet2020/search/urls.py @@ -1,4 +1,5 @@ -from django.urls import path, re_path +from django.urls import path +from django.urls import re_path from . import apps from . import views diff --git a/fet2020/search/views.py b/fet2020/search/views.py index 546f76d4..8aa2eadd 100644 --- a/fet2020/search/views.py +++ b/fet2020/search/views.py @@ -1,11 +1,11 @@ +from django.contrib.auth.mixins import LoginRequiredMixin +from django.shortcuts import render from haystack.generic_views import SearchView from haystack.query import SearchQuerySet -from django.contrib.auth.mixins import LoginRequiredMixin -from django.shortcuts import render - +from .forms import FetUserSearchForm +from .forms import NonUserSearchForm from authentications.decorators import authenticated_user -from .forms import FetUserSearchForm, NonUserSearchForm class FetUserSearchView(LoginRequiredMixin, SearchView): diff --git a/fet2020/tasks/admin.py b/fet2020/tasks/admin.py index 813ab541..a6cd99c2 100644 --- a/fet2020/tasks/admin.py +++ b/fet2020/tasks/admin.py @@ -1,7 +1,11 @@ from django.contrib import admin -from .forms import DocumentInlineForm, TaskAdminForm, TaskListAdminForm -from .models import Document, Task, TaskList +from .forms import DocumentInlineForm +from .forms import TaskAdminForm +from .forms import TaskListAdminForm +from .models import Document +from .models import Task +from .models import TaskList class DocumentInline(admin.TabularInline): diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py index 2946eee1..badd8fb0 100644 --- a/fet2020/tasks/forms.py +++ b/fet2020/tasks/forms.py @@ -1,5 +1,4 @@ from ckeditor.widgets import CKEditorWidget - from django import forms from django.contrib.admin.widgets import FilteredSelectMultiple from django.contrib.auth.models import User @@ -7,7 +6,9 @@ from django.core.validators import ValidationError from django.forms.widgets import HiddenInput from django.utils import timezone -from .models import Task, TaskList, Document +from .models import Document +from .models import Task +from .models import TaskList class DateInput(forms.DateInput): diff --git a/fet2020/tasks/models.py b/fet2020/tasks/models.py index 680ada98..cc7ef2e5 100644 --- a/fet2020/tasks/models.py +++ b/fet2020/tasks/models.py @@ -10,10 +10,10 @@ 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): diff --git a/fet2020/tasks/urls.py b/fet2020/tasks/urls.py index b7beb12f..be371a08 100644 --- a/fet2020/tasks/urls.py +++ b/fet2020/tasks/urls.py @@ -2,7 +2,10 @@ from django.urls import path from . import apps from . import views -from .views import TaskCreateView, TaskDetailView, TaskUpdateView, DocumentCreateView +from .views import DocumentCreateView +from .views import TaskCreateView +from .views import TaskDetailView +from .views import TaskUpdateView app_name = apps.TasksConfig.name diff --git a/fet2020/tasks/views.py b/fet2020/tasks/views.py index c7a04c61..d7567ada 100644 --- a/fet2020/tasks/views.py +++ b/fet2020/tasks/views.py @@ -1,23 +1,28 @@ import logging - from collections import deque 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.views.generic.edit import CreateView, UpdateView -from django.views.generic.detail import DetailView -from django.urls import reverse_lazy, reverse +from django.urls import reverse +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 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 dfcc1621..e0b0da66 100644 --- a/fet2020/tests/test_etherpad.py +++ b/fet2020/tests/test_etherpad.py @@ -1,8 +1,11 @@ -import pytest -from django.urls import reverse -from django.core.validators import ValidationError import datetime -from documents.api import ep_client, createPadifNotExists + +import pytest +from django.core.validators import ValidationError +from django.urls import reverse + +from documents.api import createPadifNotExists +from documents.api import ep_client class TestEtherpad: diff --git a/fet2020/tests/test_posts.py b/fet2020/tests/test_posts.py index c70ed599..bad19cbc 100644 --- a/fet2020/tests/test_posts.py +++ b/fet2020/tests/test_posts.py @@ -1,12 +1,17 @@ # pylint: skip-file -import pytest -from posts.models import News, Post, Event, FetMeeting -from django.urls import reverse -from django.core.validators import ValidationError import datetime -from urllib.request import URLError import random import string +from urllib.request import URLError + +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 def get_random_string(size):