Commit 5c0f6c6c by Florian Apolloner

Made the testsuite running (with failures+errors) on 1.6.

parent b2a51255
from __future__ import unicode_literals from __future__ import unicode_literals
import django
from django.contrib.contenttypes.generic import GenericRelation from django.contrib.contenttypes.generic import GenericRelation
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.db import models from django.db import models
...@@ -32,12 +33,17 @@ class TaggableManager(RelatedField): ...@@ -32,12 +33,17 @@ class TaggableManager(RelatedField):
self.help_text = help_text self.help_text = help_text
self.blank = blank self.blank = blank
self.editable = True self.editable = True
self.unique = False
self.creates_table = False self.creates_table = False
self.db_column = None self.db_column = None
self.choices = None
self.serialize = False self.serialize = False
self.null = True self.null = True
self.primary_key = False
self._choices = []
self._unique = False
# Remove once we drop 1.5 support.
if django.VERSION < (1, 6):
self.choices = None
self.unique = False
self.creation_counter = models.Field.creation_counter self.creation_counter = models.Field.creation_counter
models.Field.creation_counter += 1 models.Field.creation_counter += 1
......
...@@ -97,7 +97,7 @@ class CustomPKHousePet(CustomPKPet): ...@@ -97,7 +97,7 @@ class CustomPKHousePet(CustomPKPet):
# Test custom through model to a custom tag model # Test custom through model to a custom tag model
class OfficialTag(TagBase): class OfficialTag(TagBase):
official = models.BooleanField() official = models.BooleanField(default=False)
class OfficialThroughModel(GenericTaggedItemBase): class OfficialThroughModel(GenericTaggedItemBase):
tag = models.ForeignKey(OfficialTag, related_name="tagged_items") tag = models.ForeignKey(OfficialTag, related_name="tagged_items")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment