From 10e3faf191d8f230dde8534d1c8fad8c8717816e Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Wed, 22 Jan 2014 01:43:33 -0500 Subject: Fixed #19774 -- Deprecated the contenttypes.generic module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It contained models, forms and admin objects causing undesirable import side effects. Refs #16368. Thanks to Ramiro, Carl and Loïc for the review. --- tests/multiple_database/models.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/multiple_database') diff --git a/tests/multiple_database/models.py b/tests/multiple_database/models.py index fc5b28ad92..e02bb17f27 100644 --- a/tests/multiple_database/models.py +++ b/tests/multiple_database/models.py @@ -1,6 +1,8 @@ from django.contrib.auth.models import User +from django.contrib.contenttypes.fields import ( + GenericForeignKey, GenericRelation +) from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes import generic from django.db import models from django.utils.encoding import python_2_unicode_compatible @@ -10,7 +12,7 @@ class Review(models.Model): source = models.CharField(max_length=100) content_type = models.ForeignKey(ContentType) object_id = models.PositiveIntegerField() - content_object = generic.GenericForeignKey() + content_object = GenericForeignKey() def __str__(self): return self.source @@ -57,7 +59,7 @@ class Book(models.Model): published = models.DateField() authors = models.ManyToManyField(Person) editor = models.ForeignKey(Person, null=True, related_name='edited') - reviews = generic.GenericRelation(Review) + reviews = GenericRelation(Review) pages = models.IntegerField(default=100) def __str__(self): -- cgit v1.3