From 73939daf25f69c6c5c4c5e50e92ce8f7ff584d90 Mon Sep 17 00:00:00 2001 From: mrhanky Date: Mon, 8 Jan 2018 16:15:39 +0100 Subject: [PATCH 1/2] Fixed import of NoReverseMatch exception --- rest_framework_json_api/relations.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py index e90b4380..779b050a 100644 --- a/rest_framework_json_api/relations.py +++ b/rest_framework_json_api/relations.py @@ -4,8 +4,8 @@ import inflection import six +import django from django.core.exceptions import ImproperlyConfigured -from django.urls import NoReverseMatch from django.utils.translation import ugettext_lazy as _ from rest_framework.fields import MISSING_ERROR_MESSAGE from rest_framework.relations import MANY_RELATION_KWARGS, PrimaryKeyRelatedField @@ -21,6 +21,11 @@ get_resource_type_from_serializer ) +if django.VERSION >= (1, 10): + from django.urls import NoReverseMatch +else: + from django.core.urlresolvers import NoReverseMatch + LINKS_PARAMS = [ 'self_link_view_name', 'related_link_view_name', From c112afbf2aeedd92acb0cc85f33947393a94ff81 Mon Sep 17 00:00:00 2001 From: mrhanky Date: Mon, 8 Jan 2018 16:23:37 +0100 Subject: [PATCH 2/2] Fixed import order --- rest_framework_json_api/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_json_api/relations.py b/rest_framework_json_api/relations.py index 779b050a..7d13c747 100644 --- a/rest_framework_json_api/relations.py +++ b/rest_framework_json_api/relations.py @@ -2,9 +2,9 @@ import json from collections import OrderedDict +import django import inflection import six -import django from django.core.exceptions import ImproperlyConfigured from django.utils.translation import ugettext_lazy as _ from rest_framework.fields import MISSING_ERROR_MESSAGE