File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22import json
33from collections import OrderedDict
44
5- import six
6-
75import inflection
6+ import six
87from django .core .exceptions import ImproperlyConfigured
98from django .core .urlresolvers import NoReverseMatch
109from django .utils .translation import ugettext_lazy as _
1110from rest_framework .fields import MISSING_ERROR_MESSAGE
1211from rest_framework .relations import MANY_RELATION_KWARGS , PrimaryKeyRelatedField
1312from rest_framework .reverse import reverse
1413from rest_framework .serializers import Serializer
14+
1515from rest_framework_json_api .exceptions import Conflict
1616from rest_framework_json_api .utils import (
1717 Hyperlink ,
Original file line number Diff line number Diff line change 11import inflection
22from django .db .models .query import QuerySet
3- from django .utils import six
43from django .utils .translation import ugettext_lazy as _
54from rest_framework .exceptions import ParseError
65from rest_framework .serializers import * # noqa: F403
6+
77from rest_framework_json_api .exceptions import Conflict
88from rest_framework_json_api .relations import ResourceRelatedField
99from rest_framework_json_api .utils import (
You can’t perform that action at this time.
0 commit comments