Update to Django 1.7.11

README.rst

@@ -12,7 +12,7 @@ Development setup
     $ cd requirements
     $ pip install -r development.txt
     $ cd ..
-    $ python manage.py syncdb
+    $ python manage.py migrate
 
 Now you can start the develoment server::
 

cab/__init__.py

@@ -0,0 +1,19 @@
+def get_form():
+    from django import forms
+    from django.contrib.comments.forms import CommentForm
+
+    from captcha.fields import ReCaptchaField
+
+    class CabCommentForm(CommentForm):
+        your_name = forms.CharField(
+            label='Your Name', required=False,
+            widget=forms.TextInput(attrs={'autocomplete': 'off'}),
+        )
+        captcha = ReCaptchaField(attrs={'theme': 'clean'})
+
+        def clean(self):
+            if self.cleaned_data.get('your_name'):
+                raise forms.ValidationError('Please keep the Name field blank')
+            return self.cleaned_data
+
+    return CabCommentForm

cab/migrations/0001_initial.py

@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0002_auto_20150616_2121'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Bookmark',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('date', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'ordering': ('-date',),
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Language',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=100)),
+                ('slug', models.SlugField(unique=True)),
+                ('language_code', models.CharField(max_length=50)),
+                ('mime_type', models.CharField(max_length=100)),
+                ('file_extension', models.CharField(max_length=10)),
+            ],
+            options={
+                'ordering': ('name',),
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Snippet',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=255)),
+                ('description', models.TextField()),
+                ('description_html', models.TextField(editable=False)),
+                ('code', models.TextField()),
+                ('highlighted_code', models.TextField(editable=False)),
+                ('version', models.FloatField(default=0, choices=[(1.9, b'1.9'), (1.8, b'1.8'), (1.7, b'1.7'), (1.6, b'1.6'), (1.5, b'1.5'), (1.4, b'1.4'), (1.3, b'1.3'), (1.2, b'1.2'), (1.1, b'1.1'), (1, b'1.0'), (0.96, b'.96'), (0.95, b'Pre .96'), (0, b'Not specified')])),
+                ('pub_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('bookmark_count', models.IntegerField(default=0)),
+                ('rating_score', models.IntegerField(default=0)),
+                ('author', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('language', models.ForeignKey(to='cab.Language')),
+                ('tags', taggit.managers.TaggableManager(to='taggit.Tag', through='taggit.TaggedItem', help_text='A comma-separated list of tags.', verbose_name='Tags')),
+            ],
+            options={
+                'ordering': ('-pub_date',),
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='SnippetFlag',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('flag', models.IntegerField(choices=[(1, b'Spam'), (2, b'Inappropriate')])),
+                ('snippet', models.ForeignKey(related_name='flags', to='cab.Snippet')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='bookmark',
+            name='snippet',
+            field=models.ForeignKey(related_name='bookmarks', to='cab.Snippet'),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='bookmark',
+            name='user',
+            field=models.ForeignKey(related_name='cab_bookmarks', to=settings.AUTH_USER_MODEL),
+            preserve_default=True,
+        ),
+    ]

djangosnippets/settings/base.py

@@ -55,7 +55,6 @@ def user_url(user):
     'allauth.socialaccount.providers.twitter',
 
     'cab',
-    'cab.comments',
     'comments_spamfighter',
     'haystack',
     'pagination',
@@ -117,7 +116,7 @@ def user_url(user):
 LOGIN_REDIRECT_URL = '/'
 ACCOUNT_LOGOUT_REDIRECT_URL = '/'
 
-COMMENTS_APP = 'cab.comments'
+COMMENTS_APP = 'cab'
 
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
 

ratings/migrations/0001_initial.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RatedItem',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('score', models.FloatField(default=0, db_index=True)),
+                ('hashed', models.CharField(max_length=40, editable=False, db_index=True)),
+                ('object_id', models.IntegerField()),
+                ('content_type', models.ForeignKey(related_name='rated_items', to='contenttypes.ContentType')),
+                ('user', models.ForeignKey(related_name='rateditems', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='SimilarItem',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('object_id', models.IntegerField()),
+                ('similar_object_id', models.IntegerField()),
+                ('score', models.FloatField(default=0)),
+                ('content_type', models.ForeignKey(related_name='similar_items', to='contenttypes.ContentType')),
+                ('similar_content_type', models.ForeignKey(related_name='similar_items_set', to='contenttypes.ContentType')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

ratings/models.py

@@ -1,5 +1,4 @@
 import hashlib
-import django
 
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
@@ -73,10 +72,7 @@ def contribute_to_class(self, cls, name):
 class RatingsQuerySet(QuerySet):
     def __init__(self, model=None, query=None, using=None, hints=None, rated_model=None):
         self.rated_model = rated_model
-        if django.VERSION < (1, 7):
-            super(RatingsQuerySet, self).__init__(model, query, using)
-        else:
-            super(RatingsQuerySet, self).__init__(model, query, using, hints)
+        super(RatingsQuerySet, self).__init__(model, query, using, hints)
 
     def _clone(self, *args, **kwargs):
         instance = super(RatingsQuerySet, self)._clone(*args, **kwargs)
@@ -133,7 +129,7 @@ def __set__(self, instance, value):
         manager = self.__get__(instance)
         manager.add(*value)
 
-    def get_query_set(self):
+    def get_queryset(self):
         base_filters = self.rating_model.base_kwargs(self.rated_model)
         qs = RatingsQuerySet(self.rating_model, rated_model=self.rated_model)
         return qs.filter(**base_filters)
@@ -155,7 +151,7 @@ def create_manager(self, instance, superclass):
         rated_model = self.rated_model
 
         class RelatedManager(superclass):
-            def get_query_set(self):
+            def get_queryset(self):
                 qs = RatingsQuerySet(rel_model, rated_model=rated_model)
                 return qs.filter(**(self.core_filters))
 

requirements/base.txt

@@ -1,5 +1,5 @@
 bleach==1.4.3
-Django==1.6.11
+Django==1.7.11
 dj-database-url==0.4.1
 django-allauth==0.25.2
 django-appconf==0.6

requirements/vendor.txt

@@ -1,7 +1,7 @@
 Markdown==2.5.2
 Pygments==2.0.2
 akismet==0.2.0
-django-generic-aggregation==0.3.2
+django-generic-aggregation==0.4.0
 django-haystack==2.3.1
 django-pagination==1.0.7
 django-taggit==0.20.2