implement requested changes

example/factories/__init__.py

@@ -59,7 +59,7 @@ class Meta:
     author = factory.SubFactory(AuthorFactory)
 
 
-class EntryTaggedItemFactory(factory.django.DjangoModelFactory):
+class TaggedItemFactory(factory.django.DjangoModelFactory):
 
     class Meta:
         model = TaggedItem

example/models.py

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.fields import GenericRelation
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 
 class BaseModel(models.Model):

example/tests/conftest.py

@@ -2,22 +2,22 @@
 from pytest_factoryboy import register
 
 from example.factories import BlogFactory, AuthorFactory, AuthorBioFactory, EntryFactory, CommentFactory, \
-    EntryTaggedItemFactory
+    TaggedItemFactory
 
 register(BlogFactory)
 register(AuthorFactory)
 register(AuthorBioFactory)
 register(EntryFactory)
 register(CommentFactory)
-register(EntryTaggedItemFactory)
+register(TaggedItemFactory)
 
 
 @pytest.fixture
-def single_entry(blog, author, entry_factory, comment_factory, entry_tagged_item_factory):
+def single_entry(blog, author, entry_factory, comment_factory, tagged_item_factory):
 
     entry = entry_factory(blog=blog, authors=(author,))
     comment_factory(entry=entry)
-    entry_tagged_item_factory(content_object=entry)
+    tagged_item_factory(content_object=entry)
     return entry
 
 

rest_framework_json_api/utils.py

@@ -31,13 +31,12 @@
     from django.db.models.fields.related_descriptors import ManyToManyDescriptor, ReverseManyToOneDescriptor
     ReverseManyRelatedObjectsDescriptor = type(None)
     from django.contrib.contenttypes.fields import ReverseGenericManyToOneDescriptor
-    ReverseGenericRelatedObjectsDescriptor = type(None)
 else:
     from django.db.models.fields.related import ManyRelatedObjectsDescriptor as ManyToManyDescriptor
     from django.db.models.fields.related import ForeignRelatedObjectsDescriptor as ReverseManyToOneDescriptor
     from django.db.models.fields.related import ReverseManyRelatedObjectsDescriptor
-    from django.contrib.contenttypes.fields import ReverseGenericRelatedObjectsDescriptor
-    ReverseGenericManyToOneDescriptor = type(None)
+    from django.contrib.contenttypes.fields import ReverseGenericRelatedObjectsDescriptor as ReverseGenericManyToOneDescriptor
+
 
 def get_resource_name(context):
     """
@@ -226,9 +225,10 @@ def get_related_resource_type(relation):
             elif parent_model_relation_type is ReverseManyRelatedObjectsDescriptor:
                 relation_model = parent_model_relation.field.related.model
             elif parent_model_relation_type is ReverseGenericManyToOneDescriptor:
-                relation_model = parent_model_relation.rel.model
-            elif parent_model_relation_type is ReverseGenericRelatedObjectsDescriptor:
-                relation_model = parent_model_relation.field.related_model
+                if django.VERSION >= (1, 9):
+                    relation_model = parent_model_relation.rel.model
+                else:
+                    relation_model = parent_model_relation.field.related_model
             else:
                 return get_related_resource_type(parent_model_relation)