Get Auth User Model use the right way.

sshwsfc · sshwsfc · commit 74f673fc0db3 · 2016-09-21T21:39:56.000+08:00
diff --git a/xadmin/forms.py b/xadmin/forms.py
@@ -5,7 +5,7 @@
 
 from django.utils.translation import ugettext_lazy, ugettext as _
 
-from xadmin.util import User
+from django.contrib.auth import get_user_model
 
 ERROR_MESSAGE = ugettext_lazy("Please enter the correct username and password "
                               "for a staff account. Note that both fields are case-sensitive.")
@@ -30,6 +30,7 @@ def clean(self):
                 username=username, password=password)
             if self.user_cache is None:
                 if u'@' in username:
+                    User = get_user_model()
                     # Mistakenly entered e-mail address instead of username? Look it up.
                     try:
                         user = User.objects.get(email=username)
diff --git a/xadmin/models.py b/xadmin/models.py
@@ -17,11 +17,7 @@
 import decimal
 from xadmin.util import quote
 
-if 4 < django.VERSION[1] < 7:
-    AUTH_USER_MODEL = django.contrib.auth.get_user_model()
-else:
-    AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
-
+AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 def add_view_permissions(sender, **kwargs):
     """
diff --git a/xadmin/plugins/auth.py b/xadmin/plugins/auth.py
@@ -11,9 +11,10 @@
 from django.utils.translation import ugettext as _
 from django.views.decorators.debug import sensitive_post_parameters
 from django.forms import ModelMultipleChoiceField
+from django.contrib.auth.models import User
 from xadmin.layout import Fieldset, Main, Side, Row, FormHelper
 from xadmin.sites import site
-from xadmin.util import unquote, User
+from xadmin.util import unquote
 from xadmin.views import BaseAdminPlugin, ModelFormAdminView, ModelAdminView, CommAdminView, csrf_protect_m
 
 
diff --git a/xadmin/util.py b/xadmin/util.py
@@ -33,14 +33,6 @@
 except ImportError:
     from django.utils.timezone import localtime as tz_localtime
 
-try:
-    from django.contrib.auth import get_user_model
-    User = get_user_model()
-    username_field = User.USERNAME_FIELD
-except Exception:
-    from django.contrib.auth.models import User
-    username_field = 'username'
-
 
 def xstatic(*tags):
     from vendors import vendors
