make compatible with 1.4

Author: matclayton

experiments/models.py

@@ -1,7 +1,6 @@
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.core.serializers.json import DjangoJSONEncoder
-from django.conf import settings
 
 from jsonfield import JSONField
 
@@ -15,6 +14,13 @@
 from experiments import counters, conf
 from experiments.dateutils import now
 
+try:
+    from django.contrib.auth import get_user_model
+except ImportError: # django < 1.5
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
+
 PARTICIPANT_KEY = '%s:%s:participant'
 GOAL_KEY = '%s:%s:%s:goal'
 
@@ -165,7 +171,7 @@ def delete(self, *args, **kwargs):
 
 class Enrollment(models.Model):
     """ A participant in a split testing experiment """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True)
+    user = models.ForeignKey(User, null=True)
     experiment = models.ForeignKey(Experiment)
     enrollment_date = models.DateTimeField(auto_now_add=True)
     last_seen = models.DateTimeField(null=True)

experiments/tests/webuser.py

@@ -2,15 +2,20 @@
 
 from django.test import TestCase
 from django.test.client import RequestFactory
-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()
+try:
+    from django.contrib.auth import get_user_model
+except ImportError: # django < 1.5
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
+
 request_factory = RequestFactory()
 
 TEST_ALTERNATIVE = 'blue'

experiments/tests/webuser_incorporate.py

@@ -1,12 +1,16 @@
 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 import get_user_model
 
 from experiments.utils import DummyUser, SessionUser, AuthenticatedUser
 from experiments.models import Experiment, ENABLED_STATE
 
-User = get_user_model()
+try:
+    from django.contrib.auth import get_user_model
+except ImportError: # django < 1.5
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
 
 TEST_ALTERNATIVE = 'blue'
 EXPERIMENT_NAME='backgroundcolor'

experiments/utils.py

@@ -1,5 +1,4 @@
 from django.db import IntegrityError
-from django.contrib.auth import get_user_model
 from django.contrib.sessions.backends.base import SessionBase
 
 from experiments.models import Enrollment
@@ -14,7 +13,12 @@
 import collections
 from datetime import timedelta
 
-User = get_user_model()
+try:
+    from django.contrib.auth import get_user_model
+except ImportError: # django < 1.5
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
 
 def record_goal(request, goal_name):
     _record_goal(goal_name, request)