Merge pull request mixcloud#172 from enjoy2000/master

Fix migration on_delete

Author: matclayton

experiments/migrations/0001_initial.py

@@ -39,12 +39,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='enrollment',
             name='experiment',
-            field=models.ForeignKey(to='experiments.Experiment'),
+            field=models.ForeignKey(to='experiments.Experiment', on_delete=django.db.models.deletion.CASCADE),
         ),
         migrations.AddField(
             model_name='enrollment',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=django.db.models.deletion.CASCADE),
         ),
         migrations.AlterUniqueTogether(
             name='enrollment',

experiments/templatetags/experiments.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from django import template
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from experiments.utils import participant
 from experiments.manager import experiment_manager
@@ -101,7 +101,7 @@ def experiment(parser, token):
     return ExperimentNode(node_list, experiment_name, alternative, weight, user_variable)
 
 
-@register.assignment_tag(takes_context=True)
+@register.simple_tag(takes_context=True)
 def experiment_enroll(context, experiment_name, *alternatives, **kwargs):
     if 'user' in kwargs:
         user = participant(user=kwargs['user'])

experiments/utils.py

@@ -43,7 +43,7 @@ def _get_participant(request, session, user):
 
     if request and conf.BOT_REGEX.search(request.META.get("HTTP_USER_AGENT", "")):
         return DummyUser()
-    elif user and user.is_authenticated():
+    elif user and user.is_authenticated:
         if getattr(user, 'is_confirmed_human', True):
             return AuthenticatedUser(user, request)
         else: