Skip to content

Drop support for Django 1.8 - 1.10 #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 12, 2017
Merged

Drop support for Django 1.8 - 1.10 #387

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
50ed8d8
Drop support for loading of testing.
mblayman Dec 3, 2017
9f6a823
Add specificity to DRF support.
mblayman Dec 3, 2017
ada8f68
Drop old version support for utils.py
mblayman Dec 3, 2017
66f1f7a
Make isort happy.
mblayman Dec 3, 2017
e328179
Update relations.py and views.py to remove old version specific checks.
mblayman Dec 3, 2017
d6e56ec
More isort joy.
mblayman Dec 3, 2017
3f850f4
Got a bit overzealous deleting some stuff.
mblayman Dec 3, 2017
5398f71
Remove a deprecation notice.
mblayman Dec 3, 2017
ab71b7f
Merge branch 'master' into no-1.8-10
mblayman Dec 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Drop old version support for utils.py
  • Loading branch information
@mblayman
mblayman committed Dec 3, 2017
commit ada8f682a2bc2068d1fd2c0b0f4a36795ca6e997
61 changes: 11 additions & 50 deletions rest_framework_json_api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,33 @@
"""
Utils.
"""
import copy
import inspect
import operator
import warnings
from collections import OrderedDict

import django
import inflection
from django.conf import settings
from django.db.models import Manager
from django.db.models.fields.related_descriptors import (
ManyToManyDescriptor, ReverseManyToOneDescriptor
)
from django.utils import encoding, six
from django.utils.module_loading import import_string as import_class_from_dotted_path
from django.utils.translation import ugettext_lazy as _
from rest_framework import exceptions
from rest_framework.exceptions import APIException

try:
from rest_framework.serializers import ManyRelatedField
except ImportError:
ManyRelatedField = object()
from rest_framework.serializers import ManyRelatedField # noqa: F401

try:
from rest_framework_nested.relations import HyperlinkedRouterField
except ImportError:
HyperlinkedRouterField = object()

if django.VERSION >= (1, 9):
from django.db.models.fields.related_descriptors import (
ManyToManyDescriptor, ReverseManyToOneDescriptor # noqa: F401
)
ReverseManyRelatedObjectsDescriptor = object()
else:
from django.db.models.fields.related import ( # noqa: F401
ManyRelatedObjectsDescriptor as ManyToManyDescriptor
)
from django.db.models.fields.related import (
ForeignRelatedObjectsDescriptor as ReverseManyToOneDescriptor
)
from django.db.models.fields.related import ReverseManyRelatedObjectsDescriptor # noqa: F401

# Generic relation descriptor from django.contrib.contenttypes.
if 'django.contrib.contenttypes' not in settings.INSTALLED_APPS: # pragma: no cover
# Target application does not use contenttypes. Importing would cause errors.
ReverseGenericManyToOneDescriptor = object()
elif django.VERSION >= (1, 9):
from django.contrib.contenttypes.fields import ReverseGenericManyToOneDescriptor # noqa: F401
else:
from django.contrib.contenttypes.fields import ( # noqa: F401
ReverseGenericRelatedObjectsDescriptor as ReverseGenericManyToOneDescriptor # noqa: F401
)
from django.contrib.contenttypes.fields import ReverseGenericManyToOneDescriptor


def get_resource_name(context, expand_polymorphic_types=False):
Expand Down Expand Up @@ -236,30 +213,14 @@ def get_related_resource_type(relation):

parent_model_relation_type = type(parent_model_relation)
if parent_model_relation_type is ReverseManyToOneDescriptor:
if django.VERSION >= (1, 9):
relation_model = parent_model_relation.rel.related_model
elif django.VERSION >= (1, 8):
relation_model = parent_model_relation.related.related_model
else:
relation_model = parent_model_relation.related.model
relation_model = parent_model_relation.rel.related_model
elif parent_model_relation_type is ManyToManyDescriptor:
if django.VERSION >= (1, 9):
relation_model = parent_model_relation.field.remote_field.model
# In case we are in a reverse relation
if relation_model == parent_model:
relation_model = parent_model_relation.field.model
elif django.VERSION >= (1, 8):
relation_model = parent_model_relation.related.model
# In case we are in a reverse relation
if relation_model == parent_model:
relation_model = parent_model_relation.related.related_model
elif parent_model_relation_type is ReverseManyRelatedObjectsDescriptor:
relation_model = parent_model_relation.field.related.model
relation_model = parent_model_relation.field.remote_field.model
# In case we are in a reverse relation
if relation_model == parent_model:
relation_model = parent_model_relation.field.model
elif parent_model_relation_type is ReverseGenericManyToOneDescriptor:
if django.VERSION >= (1, 9):
relation_model = parent_model_relation.rel.model
else:
relation_model = parent_model_relation.field.related_model
relation_model = parent_model_relation.rel.model
elif hasattr(parent_model_relation, 'field'):
try:
relation_model = parent_model_relation.field.remote_field.model
Expand Down