From a1a54b47c6d250cac2f342cef6cfd60fd01c452a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Mon, 8 Jun 2015 19:30:33 +0200 Subject: [PATCH] Import GenericForeignKey from new path The path of the class changed: django.contrib.contenttypes.{generic => fields}.GenericForeignKey --- mygpo/maintenance/merge.py | 2 +- mygpo/podcastlists/models.py | 4 ++-- mygpo/podcasts/models.py | 12 ++++++------ mygpo/usersettings/models.py | 6 +++--- mygpo/votes/models.py | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mygpo/maintenance/merge.py b/mygpo/maintenance/merge.py index 8da46e49..826cd231 100644 --- a/mygpo/maintenance/merge.py +++ b/mygpo/maintenance/merge.py @@ -3,7 +3,7 @@ import collections from django.db import transaction, IntegrityError from django.contrib.contenttypes.models import ContentType from django.db.models import get_models, Model -from django.contrib.contenttypes.generic import GenericForeignKey +from django.contrib.contenttypes.fields import GenericForeignKey from mygpo.podcasts.models import (MergedUUID, ScopedModel, OrderedModel, Slug, Tag, URL, MergedUUID, Podcast, Episode) diff --git a/mygpo/podcastlists/models.py b/mygpo/podcastlists/models.py index 661e70c0..996495cd 100644 --- a/mygpo/podcastlists/models.py +++ b/mygpo/podcastlists/models.py @@ -2,7 +2,7 @@ from django.db import models from django.core.urlresolvers import reverse from django.conf import settings from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.fields import GenericForeignKey from mygpo.core.models import UpdateInfoModel, OrderedModel, UUIDModel from mygpo.podcasts.models import Podcast @@ -80,7 +80,7 @@ class PodcastListEntry(UpdateInfoModel, OrderedModel): # the object (Podcast or PodcastGroup) that is in the list content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta(OrderedModel.Meta): unique_together = [ diff --git a/mygpo/podcasts/models.py b/mygpo/podcasts/models.py index 8eb9fd02..b5e1669f 100644 --- a/mygpo/podcasts/models.py +++ b/mygpo/podcasts/models.py @@ -8,8 +8,8 @@ from django.db import models, transaction, IntegrityError from django.db.models import F from django.utils.translation import ugettext as _ from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.fields import GenericRelation -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.fields import (GenericRelation, + GenericForeignKey) from mygpo import utils from mygpo.core.models import (TwitterModel, UUIDModel, GenericManager, @@ -705,7 +705,7 @@ class URL(OrderedModel, ScopedModel): # see https://docs.djangoproject.com/en/1.6/ref/contrib/contenttypes/#generic-relations content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta(OrderedModel.Meta): unique_together = ( @@ -753,7 +753,7 @@ class Tag(models.Model): # see https://docs.djangoproject.com/en/1.6/ref/contrib/contenttypes/#generic-relations content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta: unique_together = ( @@ -774,7 +774,7 @@ class Slug(OrderedModel, ScopedModel): # see https://docs.djangoproject.com/en/1.6/ref/contrib/contenttypes/#generic-relations content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta(OrderedModel.Meta): unique_together = ( @@ -811,7 +811,7 @@ class MergedUUID(models.Model): # see https://docs.djangoproject.com/en/1.6/ref/contrib/contenttypes/#generic-relations content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta: verbose_name = 'Merged UUID' diff --git a/mygpo/usersettings/models.py b/mygpo/usersettings/models.py index f20518b4..14ebb1fc 100644 --- a/mygpo/usersettings/models.py +++ b/mygpo/usersettings/models.py @@ -3,8 +3,8 @@ import json from django.db import models from django.conf import settings from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.fields import GenericRelation -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.fields import (GenericRelation, + GenericForeignKey) from mygpo.users.settings import PUBLIC_SUB_PODCAST from mygpo.podcasts.models import Podcast @@ -68,7 +68,7 @@ class UserSettings(models.Model): # see https://docs.djangoproject.com/en/1.6/ref/contrib/contenttypes/#generic-relations content_type = models.ForeignKey(ContentType, null=True, blank=True) object_id = models.UUIDField(null=True, blank=True) - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') settings = models.TextField(null=False, default='{}') diff --git a/mygpo/votes/models.py b/mygpo/votes/models.py index d5014f5d..29663097 100644 --- a/mygpo/votes/models.py +++ b/mygpo/votes/models.py @@ -1,8 +1,8 @@ from django.db import models from django.conf import settings from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes import generic -from django.contrib.contenttypes.fields import GenericRelation +from django.contrib.contenttypes.fields import (GenericRelation, + GenericForeignKey) from mygpo.core.models import UpdateInfoModel @@ -18,7 +18,7 @@ class Vote(UpdateInfoModel): content_type = models.ForeignKey(ContentType, on_delete=models.PROTECT) # this should suit UUID and integer primary keys object_id = models.UUIDField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = GenericForeignKey('content_type', 'object_id') class Meta: unique_together = [ -- 2.11.4.GIT