File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 2
2
import json
3
3
from collections import OrderedDict
4
4
5
- import six
6
-
7
5
import inflection
6
+ import six
8
7
from django .core .exceptions import ImproperlyConfigured
9
8
from django .core .urlresolvers import NoReverseMatch
10
9
from django .utils .translation import ugettext_lazy as _
11
10
from rest_framework .fields import MISSING_ERROR_MESSAGE
12
11
from rest_framework .relations import MANY_RELATION_KWARGS , PrimaryKeyRelatedField
13
12
from rest_framework .reverse import reverse
14
13
from rest_framework .serializers import Serializer
14
+
15
15
from rest_framework_json_api .exceptions import Conflict
16
16
from rest_framework_json_api .utils import (
17
17
Hyperlink ,
Original file line number Diff line number Diff line change 1
1
import inflection
2
2
from django .db .models .query import QuerySet
3
- from django .utils import six
4
3
from django .utils .translation import ugettext_lazy as _
5
4
from rest_framework .exceptions import ParseError
6
5
from rest_framework .serializers import * # noqa: F403
6
+
7
7
from rest_framework_json_api .exceptions import Conflict
8
8
from rest_framework_json_api .relations import ResourceRelatedField
9
9
from rest_framework_json_api .utils import (
You can’t perform that action at this time.
0 commit comments