Merge 5920599 into e6a1324

flag/models.py

@@ -1,7 +1,6 @@
 from collections import namedtuple
 from enum import IntEnum, unique
 
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
@@ -12,7 +11,7 @@
 from flag.managers import FlagInstanceManager, FlagManager
 from flag.conf import settings
 
-User = get_user_model()
+User = settings.AUTH_USER_MODEL
 
 
 class Flag(models.Model):

flag/utils.py

@@ -1,14 +1,11 @@
 """General purpose functions that provide utility throughout the application"""
+from django.contrib.auth import get_user_model
 from django.apps import apps
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 
-User = get_user_model()
-
-
 def get_content_type(model_obj):
     return ContentType.objects.get_for_model(model_obj.__class__)
 
@@ -31,6 +28,7 @@ def get_model_object(*, app_name, model_name, model_id):
 
 
 def get_user_for_model(obj):
+    User = get_user_model()
     for field in obj._meta.fields:
         if field.related_model == User:
             return getattr(obj, field.name)