Removed 'get_user_model' usage in admin.py on import

Author: macro1

runtests.py

@@ -13,19 +13,15 @@
 media_root = join(abspath(dirname(__file__)), 'test_files')
 rmtree(media_root, ignore_errors=True)
 
-installed_apps = (
+installed_apps = [
     'django.contrib.contenttypes',
     'django.contrib.auth',
     'django.contrib.sessions',
     'django.contrib.admin',
     'simple_history',
     'simple_history.tests',
     'simple_history.tests.external',
-)
-auth_user_model = 'auth.User'
-if django.VERSION >= (1, 5):
-    installed_apps += ('simple_history.tests.custom_user', )
-    auth_user_model = 'custom_user.CustomUser'
+]
 
 DEFAULT_SETTINGS = dict(
     ROOT_URLCONF='simple_history.tests.urls',
@@ -37,14 +33,16 @@
             'ENGINE': 'django.db.backends.sqlite3',
         }
     },
-    AUTH_USER_MODEL=auth_user_model,
     MIDDLEWARE_CLASSES=[
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
     ],
 )
 
+if django.VERSION >= (1, 5):
+    installed_apps.append('simple_history.tests.custom_user')
+    DEFAULT_SETTINGS['AUTH_USER_MODEL'] = 'custom_user.CustomUser'
 
 def main():
     if not settings.configured:

simple_history/admin.py

@@ -19,12 +19,13 @@
     from django.utils.encoding import force_text
 except ImportError:  # django 1.3 compatibility
     from django.utils.encoding import force_unicode as force_text
+from django.conf import settings
 
 try:
-    from django.contrib.auth import get_user_model
-    User = get_user_model()
-except ImportError:  # django 1.4 compatibility
-    from django.contrib.auth.models import User
+    USER_NATURAL_KEY = settings.AUTH_USER_MODEL
+except AttributeError:
+    USER_NATURAL_KEY = "auth.User"
+USER_NATURAL_KEY = tuple(key.lower() for key in USER_NATURAL_KEY.split('.', 1))
 
 
 class SimpleHistoryAdmin(admin.ModelAdmin):
@@ -59,7 +60,8 @@ def history_view(self, request, object_id, extra_context=None):
         action_list = history.filter(**{pk_name: object_id})
         # If no history was found, see whether this object even exists.
         obj = get_object_or_404(model, pk=object_id)
-        content_type = ContentType.objects.get_for_model(User)
+        content_type = ContentType.objects.get_by_natural_key(
+            *USER_NATURAL_KEY)
         admin_user_view = 'admin:%s_%s_change' % (content_type.app_label,
                                                   content_type.model)
         context = {