Stashed lint changes

src/registrar/admin.py

@@ -739,12 +739,16 @@ class DomainAdmin(ListHeaderAdmin):
             if not err.is_connection_error():
                 # If nothing is found, will default to returned err
                 message = error_messages.get(err.code, err)
-            self.message_user(request, f"Error deleting this Domain: {message}", messages.ERROR)
+            self.message_user(
-        except TransitionNotAllowed as err:
+                request,
+                f"Error deleting this Domain: {message}",
+                messages.ERROR
+            )
+        except TransitionNotAllowed:
             if obj.state == Domain.State.DELETED:
                 self.message_user(
                     request,
-                    f"This domain is already deleted",
+                    "This domain is already deleted",
                     messages.INFO,
                 )
             else:

src/registrar/models/domain.py

@@ -769,8 +769,6 @@ class Domain(TimeStampedModel, DomainHelper):
 
         self.addAllDefaults()
 
-
-
     def addAllDefaults(self):
         security_contact = self.get_default_security_contact()
         security_contact.save()
@@ -802,7 +800,9 @@ class Domain(TimeStampedModel, DomainHelper):
         self._remove_client_hold()
         # TODO -on the client hold ticket any additional error handling here
 
-    @transition(field="state", source=[State.ON_HOLD, State.DNS_NEEDED], target=State.DELETED)
+    @transition(
+        field="state", source=[State.ON_HOLD, State.DNS_NEEDED], target=State.DELETED
+    )
     def deletedInEpp(self):
         """Domain is deleted in epp but is saved in our database.
         Error handling should be provided by the caller."""
@@ -814,14 +814,10 @@ class Domain(TimeStampedModel, DomainHelper):
             logger.info("deletedInEpp()-> inside _delete_domain")
             self._delete_domain()
         except RegistryError as err:
-            logger.error(
+            logger.error(f"Could not delete domain. Registry returned error: {err}")
-                f"Could not delete domain. Registry returned error: {err}"
-            )
             raise err
         except TransitionNotAllowed as err:
-            logger.error(
+            logger.error("Could not delete domain. FSM failure: {err}")
-                "Could not delete domain. FSM failure: {err}"
-            )
             raise err
         except Exception as err:
             logger.error(

src/registrar/models/domain_application.py

@@ -599,10 +599,6 @@ class DomainApplication(TimeStampedModel):
             "emails/domain_request_withdrawn_subject.txt",
         )
 
-    # TODO
-    #def delete(self, *args, **kwargs):
-        #super().delete(*args, **kwargs)
-    
     @transition(
         field="status",
         source=[IN_REVIEW, APPROVED],

src/registrar/tests/test_admin.py

@@ -117,14 +117,14 @@ class TestDomainAdmin(MockEppLib):
         )
         request.user = self.client
 
-        with patch('django.contrib.messages.add_message') as mock_add_message:
+        with patch("django.contrib.messages.add_message") as mock_add_message:
             self.admin.do_delete_domain(request, domain)
             mock_add_message.assert_called_once_with(
                 request,
                 messages.INFO,
                 "Domain city.gov has been deleted. Thanks!",
-                extra_tags='',
+                extra_tags="",
-                fail_silently=False
+                fail_silently=False,
             )
 
         self.assertEqual(domain.state, Domain.State.DELETED)
@@ -156,14 +156,15 @@ class TestDomainAdmin(MockEppLib):
         )
         request.user = self.client
 
-        with patch('django.contrib.messages.add_message') as mock_add_message:
+        with patch("django.contrib.messages.add_message") as mock_add_message:
             self.admin.do_delete_domain(request, domain)
             mock_add_message.assert_called_once_with(
                 request,
                 messages.ERROR,
-                "Error deleting this Domain: Can't switch from state 'ready' to 'deleted'",
+                "Error deleting this Domain: "
-                extra_tags='',
+                "Can't switch from state 'ready' to 'deleted'",
-                fail_silently=False
+                extra_tags="",
+                fail_silently=False,
             )
 
         self.assertEqual(domain.state, Domain.State.READY)
@@ -199,14 +200,14 @@ class TestDomainAdmin(MockEppLib):
         request.user = self.client
 
         # Delete it once
-        with patch('django.contrib.messages.add_message') as mock_add_message:
+        with patch("django.contrib.messages.add_message") as mock_add_message:
             self.admin.do_delete_domain(request, domain)
             mock_add_message.assert_called_once_with(
                 request,
                 messages.INFO,
                 "Domain city.gov has been deleted. Thanks!",
-                extra_tags='',
+                extra_tags="",
-                fail_silently=False
+                fail_silently=False,
             )
 
         self.assertEqual(domain.state, Domain.State.DELETED)
@@ -220,14 +221,14 @@ class TestDomainAdmin(MockEppLib):
         )
         request.user = self.client
 
-        with patch('django.contrib.messages.add_message') as mock_add_message:
+        with patch("django.contrib.messages.add_message") as mock_add_message:
             self.admin.do_delete_domain(request, domain)
             mock_add_message.assert_called_once_with(
                 request,
                 messages.INFO,
                 "This domain is already deleted",
-                extra_tags='',
+                extra_tags="",
-                fail_silently=False
+                fail_silently=False,
             )
 
         self.assertEqual(domain.state, Domain.State.DELETED)

src/registrar/tests/test_models_domain.py

@@ -942,6 +942,7 @@ class TestAnalystLock(TestCase):
 
 class TestAnalystDelete(MockEppLib):
     """Rule: Analysts may delete a domain"""
+
     def setUp(self):
         """
         Background: