Remove remaining direct references to the User model. Closes GitLab issue #225.

mayan/apps/documents/tasks.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import logging
 
 from django.apps import apps
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.db import OperationalError
 
 from mayan.celery import app
@@ -100,7 +100,7 @@ def task_upload_new_document(self, document_type_id, shared_uploaded_file_id, de
             pk=shared_uploaded_file_id
         )
         if user_id:
-            user = User.objects.get(pk=user_id)
+            user = get_user_model().objects.get(pk=user_id)
         else:
             user = None
 
@@ -150,7 +150,7 @@ def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id,
             pk=shared_uploaded_file_id
         )
         if user_id:
-            user = User.objects.get(pk=user_id)
+            user = get_user_model().objects.get(pk=user_id)
         else:
             user = None
 

mayan/apps/documents/tests/test_api.py

@@ -6,7 +6,8 @@ import time
 
 from json import loads
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+
 from django.core.files import File
 from django.core.urlresolvers import reverse
 from django.test import override_settings
@@ -32,7 +33,7 @@ class DocumentTypeAPITestCase(APITestCase):
     """
 
     def setUp(self):
-        self.admin_user = User.objects.create_superuser(
+        self.admin_user = get_user_model().objects.create_superuser(
             username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
             password=TEST_ADMIN_PASSWORD
         )
@@ -95,7 +96,7 @@ class DocumentAPITestCase(APITestCase):
     """
 
     def setUp(self):
-        self.admin_user = User.objects.create_superuser(
+        self.admin_user = get_user_model().objects.create_superuser(
             username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
             password=TEST_ADMIN_PASSWORD
         )