linting

src/registrar/models/portfolio_invitation.py

@@ -5,7 +5,11 @@ from django.db import models
 from django_fsm import FSMField, transition
 from django.contrib.auth import get_user_model
 from registrar.models import DomainInvitation, UserPortfolioPermission
-from .utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices, validate_portfolio_invitation  # type: ignore
+from .utility.portfolio_helper import (
+    UserPortfolioPermissionChoices,
+    UserPortfolioRoleChoices,
+    validate_portfolio_invitation,
+)  # type: ignore
 from .utility.time_stamped_model import TimeStampedModel
 from django.contrib.postgres.fields import ArrayField
 
@@ -87,9 +91,9 @@ class PortfolioInvitation(TimeStampedModel):
         Raises:
             RuntimeError if no matching user can be found.
         """
-        User = get_user_model()
 
         # get a user with this email address
+        User = get_user_model()
         try:
             user = User.objects.get(email=self.email)
         except User.DoesNotExist:

src/registrar/models/user_portfolio_permission.py

@@ -1,6 +1,4 @@
 from django.db import models
-from django.forms import ValidationError
-from registrar.utility.waffle import flag_is_active_for_user
 from registrar.models import UserDomainRole
 from registrar.models.utility.portfolio_helper import (
     UserPortfolioPermissionChoices,
@@ -125,7 +123,6 @@ class UserPortfolioPermission(TimeStampedModel):
     def get_forbidden_permissions(cls, roles, additional_permissions):
         """Some permissions are forbidden for certain roles, like member.
         This checks for conflicts between the role and additional_permissions."""
-        portfolio_permissions = set(cls.get_portfolio_permissions(roles, additional_permissions))
 
         # Get intersection of forbidden permissions across all roles.
         # This is because if you have roles ["admin", "member"], then they can have the
@@ -137,8 +134,8 @@ class UserPortfolioPermission(TimeStampedModel):
         )
 
         # Check if the users current permissions overlap with any forbidden permissions
-        bad_perms = portfolio_permissions & common_forbidden_perms
+        portfolio_permissions = set(cls.get_portfolio_permissions(roles, additional_permissions))
-        return bad_perms
+        return portfolio_permissions & common_forbidden_perms
 
     def clean(self):
         """Extends clean method to perform additional validation, which can raise errors in django admin."""

src/registrar/tests/test_views_portfolio.py

@@ -483,7 +483,7 @@ class TestPortfolio(WebTest):
         """When multiple_portfolios flag is true and user does not have a portfolio,
         the portfolio should be set to None in session."""
         self.client.force_login(self.user)
-        with override_flag(, active=True):
+        with override_flag("multiple_portfolios", active=True):
             response = self.client.get(reverse("home"))
             # Ensure that middleware processes the session
             session_middleware = SessionMiddleware(lambda request: None)