Use Django's AUTH_USER_MODEL rather than the default User model

badger/feeds.py

@@ -9,7 +9,8 @@
 import django.utils.simplejson as json
 from django.shortcuts import get_object_or_404
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 from django.conf import settings
 
 try:

badger/models.py

@@ -20,7 +20,10 @@
 from django.core.exceptions import ValidationError
 from django.core.files.storage import FileSystemStorage
 from django.core.files.base import ContentFile
-from django.contrib.auth.models import User, AnonymousUser
+from django.contrib.auth.models import AnonymousUser
+from django.contrib.auth import get_user_model
+User = get_user_model()
+
 from django.contrib.sites.models import Site
 from django.contrib.contenttypes.models import ContentType
 

badger/tests/__init__.py

@@ -5,7 +5,8 @@
 from django.conf import settings
 from django.core.management import call_command
 from django.db.models import loading
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 from django import test
 from django.utils.translation import get_language
 

badger/tests/test_badges_py.py

@@ -3,7 +3,8 @@
 from django.conf import settings
 from django.core.management import call_command
 from django.template.defaultfilters import slugify
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 from nose.tools import assert_equal, with_setup, assert_false, eq_, ok_
 from nose.plugins.attrib import attr

badger/tests/test_feeds.py

@@ -13,7 +13,8 @@
 
 from django.template.defaultfilters import slugify
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 try:
     from commons.urlresolvers import reverse

badger/tests/test_models.py

@@ -32,7 +32,8 @@
 except ImportError:
     from django.core.urlresolvers import reverse
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 from . import BadgerTestCase, patch_settings
 

badger/tests/test_views.py

@@ -9,7 +9,8 @@
 from django.utils import simplejson
 from django.utils.translation import get_language
 
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 from pyquery import PyQuery as pq
 

badger/views.py

@@ -31,7 +31,8 @@
 from django.contrib import messages
 
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+User = get_user_model()
 
 try:
     import taggit