Skip to content

Commit

Permalink
ruff formating
Browse files Browse the repository at this point in the history
  • Loading branch information
GDay committed Nov 7, 2023
1 parent c1677e7 commit 62071bf
Show file tree
Hide file tree
Showing 23 changed files with 32 additions and 36 deletions.
2 changes: 1 addition & 1 deletion back/admin/admin_tasks/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import Http404
from django.shortcuts import get_object_or_404, redirect
Expand All @@ -8,7 +9,6 @@
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import AdminTaskCommentForm, AdminTaskCreateForm, AdminTaskUpdateForm
from .models import AdminTask, AdminTaskComment
Expand Down
2 changes: 1 addition & 1 deletion back/admin/appointments/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import AppointmentForm
from .models import Appointment
Expand Down
2 changes: 1 addition & 1 deletion back/admin/badges/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import BadgeForm
from .models import Badge
Expand Down
2 changes: 1 addition & 1 deletion back/admin/integrations/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import requests
from django.contrib import messages
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.shortcuts import get_object_or_404, redirect
from django.urls import reverse_lazy
Expand All @@ -14,7 +15,6 @@
from django.views.generic.edit import CreateView, DeleteView, UpdateView

from users.mixins import AdminPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import IntegrationExtraArgsForm, IntegrationForm
from .models import Integration
Expand Down
2 changes: 1 addition & 1 deletion back/admin/introductions/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
Expand All @@ -6,7 +7,6 @@
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin
from users.models import User

from .forms import IntroductionForm
Expand Down
2 changes: 1 addition & 1 deletion back/admin/people/access_views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import messages
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse_lazy
Expand All @@ -12,7 +13,6 @@
from admin.integrations.models import Integration
from users.mixins import IsAdminOrNewHireManagerMixin
from users.models import IntegrationUser
from django.contrib.auth.mixins import LoginRequiredMixin


class NewHireAccessView(LoginRequiredMixin, IsAdminOrNewHireManagerMixin, DetailView):
Expand Down
2 changes: 1 addition & 1 deletion back/admin/people/new_hire_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import Http404
from django.shortcuts import get_object_or_404, redirect, render
Expand Down Expand Up @@ -37,7 +38,6 @@
IsAdminOrNewHireManagerMixin,
ManagerPermMixin,
)
from django.contrib.auth.mixins import LoginRequiredMixin
from users.models import NewHireWelcomeMessage, PreboardingUser, ResourceUser, ToDoUser

from .forms import (
Expand Down
2 changes: 1 addition & 1 deletion back/admin/people/views.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
Expand Down Expand Up @@ -33,7 +34,6 @@
ManagerPermMixin,
)
from users.models import ToDoUser
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import (
ColleagueCreateForm,
Expand Down
2 changes: 1 addition & 1 deletion back/admin/preboarding/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import PreboardingForm
from .models import Preboarding
Expand Down
2 changes: 1 addition & 1 deletion back/admin/resources/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import ResourceForm
from .models import Resource
Expand Down
3 changes: 1 addition & 2 deletions back/admin/sequences/offboarding_views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext as _
from django.views.generic.list import ListView
from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from admin.sequences.models import Sequence
from users.mixins import ManagerPermMixin
Expand Down
2 changes: 1 addition & 1 deletion back/admin/sequences/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, render
Expand Down Expand Up @@ -26,7 +27,6 @@
from admin.templates.utils import get_templates_model
from admin.to_do.models import ToDo
from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import (
ConditionForm,
Expand Down
3 changes: 1 addition & 2 deletions back/admin/settings/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.urls import path, include

from allauth.mfa import views as allauth_mfa_views
from django.urls import include, path

from . import views

Expand Down
16 changes: 8 additions & 8 deletions back/admin/settings/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
from allauth.account.decorators import reauthentication_required
from allauth.mfa.views import (
ActivateTOTPView,
DeactivateTOTPView,
GenerateRecoveryCodesView,
IndexView,
)
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import get_object_or_404
Expand All @@ -16,13 +24,6 @@
from twilio.rest import Client

from admin.integrations.models import Integration
from allauth.mfa.views import (
IndexView,
ActivateTOTPView,
DeactivateTOTPView,
GenerateRecoveryCodesView,
)
from allauth.account.decorators import reauthentication_required
from organization.models import Notification, Organization, WelcomeMessage
from slack_bot.models import SlackChannel
from slack_bot.utils import Slack, actions, button, paragraph
Expand All @@ -32,7 +33,6 @@
send_new_hire_preboarding,
)
from users.mixins import AdminPermMixin, ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import (
AdministratorsCreateForm,
Expand Down
2 changes: 1 addition & 1 deletion back/admin/templates/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.shortcuts import get_object_or_404, redirect
from django.views.generic import View

from admin.sequences.models import Sequence
from admin.templates.utils import get_templates_model
from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin


class TemplateDuplicateView(LoginRequiredMixin, ManagerPermMixin, View):
Expand Down
2 changes: 1 addition & 1 deletion back/admin/to_do/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse_lazy
from django.utils.translation import gettext_lazy as _
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.views.generic.list import ListView

from users.mixins import ManagerPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin

from .forms import ToDoForm
from .models import ToDo
Expand Down
2 changes: 1 addition & 1 deletion back/new_hire/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from axes.decorators import axes_dispatch
from django.contrib import messages
from django.contrib.auth import get_user_model, login, signals
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
Expand All @@ -18,7 +19,6 @@
from admin.resources.models import Chapter, CourseAnswer, Resource
from admin.to_do.models import ToDo
from organization.models import Notification
from django.contrib.auth.mixins import LoginRequiredMixin
from users.models import (
NewHireWelcomeMessage,
PreboardingUser,
Expand Down
2 changes: 1 addition & 1 deletion back/organization/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import LoginRequiredMixin
from django.core import management
from django.db import transaction
from django.http import Http404
Expand All @@ -23,7 +24,6 @@
from misc.serializers import FileSerializer
from slack_bot.models import SlackChannel
from users.mixins import AdminPermMixin
from django.contrib.auth.mixins import LoginRequiredMixin
from users.models import User

from .forms import InitalAdminAccountForm
Expand Down
2 changes: 1 addition & 1 deletion back/user_auth/tests.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from unittest.mock import Mock, patch

from allauth.mfa.models import Authenticator
import jwt
import pytest
from allauth.mfa.models import Authenticator
from django.contrib import auth
from django.urls import reverse

Expand Down
2 changes: 1 addition & 1 deletion back/user_auth/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.urls import path, re_path
from allauth.account import views as allauth_views
from allauth.mfa import views as allauth_mfa_views
from django.urls import path, re_path

from . import views

Expand Down
2 changes: 1 addition & 1 deletion back/user_auth/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import get_user_model, login
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth.views import LoginView, LogoutView
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import redirect
Expand All @@ -16,7 +17,6 @@

from admin.integrations.models import Integration
from organization.models import Organization
from django.contrib.auth.mixins import LoginRequiredMixin

logger = logging.getLogger(__name__)

Expand Down
4 changes: 1 addition & 3 deletions back/users/adapter.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
from cryptography.fernet import Fernet

from allauth.account.adapter import DefaultAccountAdapter
from allauth.mfa.adapter import DefaultMFAAdapter

from cryptography.fernet import Fernet
from django.conf import settings
from django.utils.encoding import force_bytes, force_str

Expand Down
6 changes: 3 additions & 3 deletions back/users/migrations/0037_delete_otprecoverykey.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Generated by Django 4.2.5 on 2023-11-07 15:36

from django.contrib.auth import get_user_model
from django.db import migrations
from allauth.mfa.models import Authenticator
from allauth.account.models import EmailAddress
from allauth.mfa.models import Authenticator
from allauth.mfa.utils import encrypt
from django.contrib.auth import get_user_model
from django.db import migrations


class Migration(migrations.Migration):
Expand Down

0 comments on commit 62071bf

Please sign in to comment.