Fix test + lint

src/registrar/fixtures_users.py

@@ -6,7 +6,7 @@ from registrar.models import (
     User,
     UserGroup,
 )
-from registrar.models.verified_by_staff import VerifiedByStaff
+
 
 fake = Faker()
 logger = logging.getLogger(__name__)

src/registrar/models/user.py

@@ -29,6 +29,7 @@ class User(AbstractUser):
         Users achieve access to our system in a few different ways.
         These choices reflect those pathways.
         """
+
         GRANDFATHERED = "grandfathered", "Legacy user"
         VERIFIED_BY_STAFF = "verified_by_staff", "Verified by staff"
         REGULAR = "regular", "Verified by Login.gov"

src/registrar/tests/test_admin.py

@@ -2820,7 +2820,7 @@ class MyUserAdminTest(TestCase):
             request.user = create_user()
             fieldsets = self.admin.get_fieldsets(request)
             expected_fieldsets = (
-                (None, {"fields": ("password", "status")}),
+                (None, {"fields": ("password", "status", "verification_type")}),
                 ("Personal Info", {"fields": ("first_name", "last_name", "email")}),
                 ("Permissions", {"fields": ("is_active", "groups")}),
                 ("Important dates", {"fields": ("last_login", "date_joined")}),