From a277336a067aad3be0cd6d0fcdd6d2aa8e789d3b Mon Sep 17 00:00:00 2001 From: Neil Martinsen-Burrell Date: Wed, 24 May 2023 15:38:26 -0500 Subject: [PATCH] fix linting errors --- src/registrar/views/application.py | 7 +++---- src/registrar/views/domain.py | 11 +++++++---- src/registrar/views/utility/permission_views.py | 6 ++++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py index e0c9773f6..b8454bf78 100644 --- a/src/registrar/views/application.py +++ b/src/registrar/views/application.py @@ -6,7 +6,6 @@ from django.shortcuts import redirect, render from django.urls import resolve, reverse from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView -from django.views import generic from django.contrib import messages from registrar.forms import application_wizard as forms @@ -494,13 +493,13 @@ class ApplicationWithdrawConfirmation(DomainApplicationPermissionView): class ApplicationWithdrawn(DomainApplicationPermissionView): # this view renders no template - template_name = None + template_name = "" def get(self, *args, **kwargs): """View class that does the actual withdrawing. - If user click on withdraw confirm button, this view updates the status to withdraw - and send back to homepage. + If user click on withdraw confirm button, this view updates the status + to withdraw and send back to homepage. """ application = DomainApplication.objects.get(id=self.kwargs["pk"]) application.status = "withdrawn" diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index e954ffefc..361175295 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -12,10 +12,9 @@ from django.contrib.messages.views import SuccessMessageMixin from django.db import IntegrityError from django.shortcuts import redirect from django.urls import reverse -from django.views.generic import DetailView -from django.views.generic.edit import DeleteView, FormMixin +from django.views.generic.edit import FormMixin -from registrar.models import Domain, DomainInvitation, User, UserDomainRole +from registrar.models import DomainInvitation, User, UserDomainRole from ..forms import DomainAddUserForm, NameserverFormset, DomainSecurityEmailForm from ..utility.email import send_templated_email, EmailSendingError @@ -235,7 +234,11 @@ class DomainAddUserView(DomainPermissionView, FormMixin): return redirect(self.get_success_url()) -class DomainInvitationDeleteView(DomainInvitationPermissionDeleteView): +class DomainInvitationDeleteView( + DomainInvitationPermissionDeleteView, SuccessMessageMixin +): + object: DomainInvitation # workaround for type mismatch in DeleteView + def get_success_url(self): return reverse("domain-users", kwargs={"pk": self.object.domain.id}) diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py index d5f4525d8..e52ed102c 100644 --- a/src/registrar/views/utility/permission_views.py +++ b/src/registrar/views/utility/permission_views.py @@ -17,7 +17,8 @@ class DomainPermissionView(DomainPermission, DetailView, abc.ABC): """Abstract base view for domains that enforces permissions. - This abstract view cannot be instantiated. Actual views must specify `template_name`. + This abstract view cannot be instantiated. Actual views must specify + `template_name`. """ # DetailView property for what model this is viewing @@ -36,7 +37,8 @@ class DomainApplicationPermissionView(DomainApplicationPermission, DetailView, a """Abstract base view for domain applications that enforces permissions - This abstract view cannot be instantiated. Actual views must specify `template_name`. + This abstract view cannot be instantiated. Actual views must specify + `template_name`. """ # DetailView property for what model this is viewing