Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 2166e4c

Browse files
fix OrderedDict import for drf3.3
1 parent d9bd7ec commit 2166e4c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎rest_framework_json_api/pagination.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"""
22
Pagination fields
33
"""
4+
from collections import OrderedDict
45
from rest_framework import serializers
56
from rest_framework.views import Response
6-
from rest_framework.compat import OrderedDict
77
from rest_framework.pagination import PageNumberPagination
88
from rest_framework.templatetags.rest_framework import replace_query_param
99

‎rest_framework_json_api/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
Utils.
33
"""
44
import copy
5+
from collections import OrderedDict
56

67
import inflection
78
from django.conf import settings
89
from django.utils import six, encoding
910
from django.utils.translation import ugettext_lazy as _
10-
from rest_framework.compat import OrderedDict
1111
from rest_framework.serializers import BaseSerializer, ListSerializer, ModelSerializer
1212
from rest_framework.relations import RelatedField, HyperlinkedRelatedField, PrimaryKeyRelatedField, \
1313
HyperlinkedIdentityField

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /