Reordering imports

This commit is contained in:
2023-01-09 16:34:02 +00:00
parent 771eaa3917
commit eca6d68dc3
47 changed files with 259 additions and 183 deletions

View File

@@ -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

View File

@@ -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):

View File

@@ -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):

View File

@@ -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

View File

@@ -1,5 +1,4 @@
from ckeditor_uploader.widgets import CKEditorUploadingWidget
from django import forms
from .models import CustomFlatPage

View File

@@ -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

View File

@@ -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__)

View File

@@ -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

View File

@@ -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),

View File

@@ -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()

View File

@@ -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

View File

@@ -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):

View File

@@ -1,6 +1,5 @@
from haystack import indexes
from django.utils import timezone
from haystack import indexes
from .models import Album

View File

@@ -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"]

View File

@@ -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):

View File

@@ -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):

View File

@@ -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):

View File

@@ -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

View File

@@ -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

View File

@@ -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__)

View File

@@ -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):

View File

@@ -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):

View File

@@ -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__)

View File

@@ -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):

View File

@@ -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")

View File

@@ -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

View File

@@ -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__)

View File

@@ -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):

View File

@@ -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):

View File

@@ -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__)

View File

@@ -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):

View File

@@ -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__)

View File

@@ -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):

View File

@@ -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")

View File

@@ -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

View File

@@ -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):

View File

@@ -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__)

View File

@@ -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

View File

@@ -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

View File

@@ -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):

View File

@@ -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):

View File

@@ -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):

View File

@@ -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):

View File

@@ -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

View File

@@ -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__)

View File

@@ -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:

View File

@@ -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):