Remove warnings for GenericForeignKey

Author: Fantomas42

tagging/models.py

@@ -5,9 +5,12 @@
 from django.db import connection
 from django.utils.encoding import smart_text
 from django.utils.encoding import python_2_unicode_compatible
-from django.contrib.contenttypes import generic
-from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext_lazy as _
+from django.contrib.contenttypes.models import ContentType
+try:
+    from django.contrib.contenttypes.fields import GenericForeignKey
+except ImportError:
+    from django.contrib.contenttypes.generic import GenericForeignKey
 
 from . import settings
 from .utils import LOGARITHMIC
@@ -484,7 +487,7 @@ class TaggedItem(models.Model):
     tag = models.ForeignKey(Tag, verbose_name=_('tag'), related_name='items')
     content_type = models.ForeignKey(ContentType, verbose_name=_('content type'))
     object_id = models.PositiveIntegerField(_('object id'), db_index=True)
-    object = generic.GenericForeignKey('content_type', 'object_id')
+    object = GenericForeignKey('content_type', 'object_id')
 
     objects = TaggedItemManager()