Start compatibility with Django 1.8

Fantomas42 · Apr 26, 2015 · e111d80 · e111d80
2 parents be7ae9e + ab1c806
commit e111d80
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/demo/urls.py b/demo/urls.py
@@ -13,7 +13,7 @@
 
 urlpatterns = patterns(
     '',
-    url(r'^$', RedirectView.as_view(url='/blog/')),
+    url(r'^$', RedirectView.as_view(url='/blog/', permanent=True)),
     url(r'^blog/', include('zinnia.urls', namespace='zinnia')),
     url(r'^comments/', include('django_comments.urls')),
     url(r'^xmlrpc/$', 'django_xmlrpc.views.handle_xmlrpc'),

diff --git a/zinnia/models_bases/entry.py b/zinnia/models_bases/entry.py
@@ -349,7 +349,7 @@ class RelatedEntry(models.Model):
     """
     related = models.ManyToManyField(
         'self',
-        blank=True, null=True,
+        blank=True,
         verbose_name=_('related entries'))
 
     @property
@@ -465,8 +465,8 @@ class AuthorsEntry(models.Model):
     """
     authors = models.ManyToManyField(
         'zinnia.Author',
+        blank=True,
         related_name='entries',
-        blank=True, null=False,
         verbose_name=_('authors'))
 
     class Meta:
@@ -479,8 +479,8 @@ class CategoriesEntry(models.Model):
     """
     categories = models.ManyToManyField(
         'zinnia.Category',
+        blank=True,
         related_name='entries',
-        blank=True, null=True,
         verbose_name=_('categories'))
 
     class Meta:

diff --git a/zinnia/tests/test_entry.py b/zinnia/tests/test_entry.py
@@ -324,6 +324,9 @@ class EntryCustomImageUploadTo(Entry):
             def image_upload_to(self, filename):
                 return 'custom.png'
 
+            class Meta:
+                proxy = True
+
         custom_entry = EntryCustomImageUploadTo()
         self.assertEqual(
             entry.image_upload_to_dispatcher(custom_entry, 'image.gif'),