Merge branch 'jinja'

botbot/apps/accounts/migrations/0002_auto_20150630_1459.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.core.validators
+import django.contrib.auth.models
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0006_require_contenttypes_0002'),
+        ('bots', '0001_initial'),
+        ('accounts', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='user',
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.AddField(
+            model_name='membership',
+            name='channel',
+            field=models.ForeignKey(default=1, to='bots.Channel'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='membership',
+            name='user',
+            field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='groups',
+            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='user_permissions',
+            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=254, verbose_name='email address', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='last_login',
+            field=models.DateTimeField(null=True, verbose_name='last login', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='membership',
+            unique_together=set([('user', 'channel')]),
+        ),
+    ]

botbot/apps/accounts/tests.py

@@ -66,19 +66,19 @@ def test_template_used(self):
         self.assertEquals(response.status_code, 200)
 
         for var in ('admin_channels', 'private_channels'):
-            self.assertTrue(var not in response.context.keys())
+            self.assertTrue(var not in response.context_data.keys())
 
-        self.assertTemplateUsed(response, 'accounts/anon_dashboard.html')
+        self.assertIn('accounts/anon_dashboard.html', response.template_name)
 
         self.client.login(username="dupont éîïè", password='secret')
 
         response = self.client.get(self.url)
         self.assertEquals(response.status_code, 200)
 
         for var in ('admin_channels', 'private_channels'):
-            self.assertIn(var, response.context.keys())
+            self.assertIn(var, response.context_data.keys())
 
-        self.assertTemplateUsed(response, 'accounts/user_dashboard.html')
+        self.assertIn('accounts/user_dashboard.html', response.template_name)
 
 
 class ChannelsTests(AccountMixin, TestCase):
@@ -94,7 +94,7 @@ def test_template_context_variables(self):
         response = self.client.get(self.url)
         self.assertEquals(response.status_code, 200)
         for var in ('admin_channels', 'private_channels'):
-            self.assertTrue(var not in response.context.keys())
+            self.assertTrue(var not in response.context_data.keys())
         self.assertNotContains(response, 'Private')
 
         self.client.login(username="dupont éîïè", password='secret')
@@ -103,7 +103,7 @@ def test_template_context_variables(self):
         self.assertEquals(response.status_code, 200)
 
         for var in ('admin_channels', 'private_channels'):
-            self.assertIn(var, response.context.keys())
+            self.assertIn(var, response.context_data.keys())
 
         self.assertContains(response, 'Private')
 
@@ -128,7 +128,7 @@ def test_update_account(self):
         self.client.login(username='Marie Thérèse', password='secret')
 
         response = self.client.get(self.url)
-        instance = response.context['form'].instance
+        instance = response.context_data['form'].instance
 
         self.assertEqual(self.outsider, instance)
 
@@ -154,7 +154,7 @@ def test_change_password(self):
 
         response = self.client.get(self.url)
         # password form should be in template context
-        self.assertIn('password_form', response.context)
+        self.assertIn('password_form', response.context_data)
 
         data = {
             'username': 'marie',
@@ -167,7 +167,7 @@ def test_change_password(self):
         response = self.client.post(self.url, data=data)
         self.assertEquals(response.status_code, 200)
         self.assertEquals(
-            response.context['password_form'].errors,
+            response.context_data['password_form'].errors,
             {'new_password2': [u"The two password fields didn't match."]})
 
         data.update({

botbot/apps/bots/admin.py

@@ -55,6 +55,7 @@ def botbot_refresh(modeladmin, request, queryset):
 class ChannelForm(forms.ModelForm):
     class Meta:
         model = models.Channel
+        exclude = []
 
     def clean_private_slug(self):
         return self.cleaned_data['private_slug'] or None