fix user imports

Author: matclayton

experiments/tests/webuser.py

@@ -2,14 +2,17 @@
 
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.contrib.auth.models import User, AnonymousUser
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser
 from django.contrib.sessions.backends.db import SessionStore as DatabaseSession
 
 from experiments.models import Experiment, ENABLED_STATE
 from experiments.conf import CONTROL_GROUP, VISIT_COUNT_GOAL
 from experiments.utils import participant
 
+User = get_user_model()
 request_factory = RequestFactory()
+
 TEST_ALTERNATIVE = 'blue'
 TEST_GOAL = 'buy'
 EXPERIMENT_NAME='backgroundcolor'

experiments/tests/webuser_incorporate.py

@@ -1,11 +1,13 @@
 from django.test import TestCase
 from django.utils.unittest import TestSuite
 from django.contrib.sessions.backends.db import SessionStore as DatabaseSession
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 
 from experiments.utils import DummyUser, SessionUser, AuthenticatedUser
 from experiments.models import Experiment, ENABLED_STATE
 
+User = get_user_model()
+
 TEST_ALTERNATIVE = 'blue'
 EXPERIMENT_NAME='backgroundcolor'
 

experiments/utils.py

@@ -1,5 +1,5 @@
 from django.db import IntegrityError
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.contrib.sessions.backends.base import SessionBase
 
 from experiments.models import Enrollment
@@ -14,8 +14,7 @@
 import collections
 from datetime import timedelta
 
-# Known bots user agents to drop from experiments
-
+User = get_user_model()
 
 def record_goal(request, goal_name):
     _record_goal(goal_name, request)