diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 1c4cbb355..c83af8ff0 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -6,7 +6,6 @@ from django.conf import settings from django.db import models from django_fsm import FSMField, transition # type: ignore from django.utils import timezone -from waffle import flag_is_active from registrar.models.domain import Domain from registrar.models.federal_agency import FederalAgency from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper @@ -1207,7 +1206,6 @@ class DomainRequest(TimeStampedModel): return self.is_policy_acknowledged is not None def _is_general_form_complete(self, request): - has_profile_feature_flag = flag_is_active(request, "profile_feature") return ( self._is_creator_complete() and self._is_organization_name_and_address_complete() diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index ea2462dfb..566f9b3cf 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -918,7 +918,6 @@ def completed_domain_request( # noqa domain, _ = DraftDomain.objects.get_or_create(name=name) alt, _ = Website.objects.get_or_create(website="city1.gov") current, _ = Website.objects.get_or_create(website="city.com") - creator = user other, _ = Contact.objects.get_or_create( first_name="Testy", last_name="Tester", diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 4cce3ed14..3add7a201 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -60,7 +60,7 @@ from .common import ( ) from django.contrib.sessions.backends.db import SessionStore from django.contrib.auth import get_user_model -from unittest.mock import patch, Mock +from unittest.mock import Mock import logging diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py index fab64180f..56c7b838f 100644 --- a/src/registrar/tests/test_views_request.py +++ b/src/registrar/tests/test_views_request.py @@ -2242,7 +2242,7 @@ class DomainRequestTests(TestWithUser, WebTest): session_id = self.app.cookies[settings.SESSION_COOKIE_NAME] self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) - profile_page = self.app.get(f"/user-profile") + profile_page = self.app.get("/user-profile") self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id) profile_form = profile_page.forms[0] diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py index 4de2ad31e..260d6c8f4 100644 --- a/src/registrar/views/domain.py +++ b/src/registrar/views/domain.py @@ -40,7 +40,6 @@ from registrar.models.utility.contact_error import ContactError from registrar.views.utility.permission_views import UserDomainRolePermissionDeleteView from ..forms import ( - UserForm, SeniorOfficialContactForm, DomainOrgNameAddressForm, DomainAddUserForm, @@ -59,7 +58,6 @@ from epplibwrapper import ( from ..utility.email import send_templated_email, EmailSendingError from .utility import DomainPermissionView, DomainInvitationPermissionDeleteView -from waffle.decorators import waffle_flag logger = logging.getLogger(__name__) diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 05f4e38ff..f1cd5fbbf 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -22,8 +22,6 @@ from .utility import ( DomainRequestWizardPermissionView, ) -from waffle.decorators import flag_is_active, waffle_flag - logger = logging.getLogger(__name__)