linter and merge fixes

src/registrar/assets/src/js/getgov/main.js

@@ -1,5 +1,4 @@
 import { hookupYesNoListener, hookupCallbacksToRadioToggler } from './radios.js';
-import { hookupYesNoListener } from './radios.js';
 import { initDomainValidators } from './domain-validators.js';
 import { initFormsetsForms, triggerModalOnDsDataForm } from './formset-forms.js';
 import { initFormNameservers } from './form-nameservers'

src/registrar/forms/domain_request_wizard.py

@@ -607,6 +607,7 @@ class DotGovDomainForm(RegistrarForm):
         },
     )
 
+
 class PurposeDetailsForm(BaseDeletableRegistrarForm):
 
     field_name = "purpose"

src/registrar/models/domain_request.py

@@ -1439,6 +1439,7 @@ class DomainRequest(TimeStampedModel):
         if self.portfolio:
             return self.portfolio.federal_type == BranchChoices.EXECUTIVE
         return False
+
     def is_federal(self) -> Union[bool, None]:
         """Is this domain request for a federal agency?
 

src/registrar/tests/test_views_request.py

@@ -2618,7 +2618,9 @@ class DomainRequestTests(TestWithUser, WebTest):
         domain_form["dotgov_domain-requested_domain"] = domain
         domain_form["dotgov_domain-feb_naming_requirements"] = "True"
         domain_form["dotgov_domain-feb_naming_requirements_details"] = "test"
-        with patch('registrar.forms.domain_request_wizard.DotGovDomainForm.clean_requested_domain', return_value=domain):  # noqa
+        with patch(
+            "registrar.forms.domain_request_wizard.DotGovDomainForm.clean_requested_domain", return_value=domain
+        ):  # noqa
             self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
             domain_result = domain_form.submit()
 
@@ -2628,7 +2630,6 @@ class DomainRequestTests(TestWithUser, WebTest):
 
         self.feb_purpose_page_tests(purpose_page)
 
-
     def feb_purpose_page_tests(self, purpose_page):
         self.assertContains(purpose_page, "What is the purpose of your requested domain?")
 

src/registrar/views/domain_request.py

@@ -660,8 +660,8 @@ class DotgovDomain(DomainRequestWizard):
     forms = [
         forms.DotGovDomainForm,
         forms.AlternativeDomainFormSet,
-        forms.ExecutiveNamingRequirementsYesNoForm,
-        forms.ExecutiveNamingRequirementsDetailsForm,
+        feb.ExecutiveNamingRequirementsYesNoForm,
+        feb.ExecutiveNamingRequirementsDetailsForm,
     ]
 
     def get_context_data(self):