aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2014-11-06 12:00:30 +0000
committerTom Christie2014-11-06 12:00:30 +0000
commit4e001dbb7ac0bc13d6d5fbb4524e905184610aa2 (patch)
treef653aa5d1e0eaff780ba52039f29085e4bc8f54c /rest_framework/serializers.py
parent9923a6ce9013693ea1723e7895b3cab638d719fd (diff)
downloaddjango-rest-framework-4e001dbb7ac0bc13d6d5fbb4524e905184610aa2.tar.bz2
Drop usage of SortedDict. Closes #2027.
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 7cd206c9..0efa9524 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -14,8 +14,8 @@ from django.core.exceptions import ImproperlyConfigured
from django.db import models
from django.db.models.fields import FieldDoesNotExist
from django.utils import six
-from django.utils.datastructures import SortedDict
from django.utils.translation import ugettext_lazy as _
+from rest_framework.compat import OrderedDict
from rest_framework.exceptions import ValidationError
from rest_framework.fields import empty, set_value, Field, SkipField
from rest_framework.settings import api_settings
@@ -159,7 +159,7 @@ class BaseSerializer(Field):
# Serializer & ListSerializer classes
# -----------------------------------
-class ReturnDict(SortedDict):
+class ReturnDict(OrderedDict):
"""
Return object from `serialier.data` for the `Serializer` class.
Includes a backlink to the serializer instance for renderers
@@ -235,7 +235,7 @@ class BindingDict(object):
"""
def __init__(self, serializer):
self.serializer = serializer
- self.fields = SortedDict()
+ self.fields = OrderedDict()
def __setitem__(self, key, field):
self.fields[key] = field
@@ -280,7 +280,7 @@ class SerializerMetaclass(type):
if hasattr(base, '_declared_fields'):
fields = list(base._declared_fields.items()) + fields
- return SortedDict(fields)
+ return OrderedDict(fields)
def __new__(cls, name, bases, attrs):
attrs['_declared_fields'] = cls._get_declared_fields(bases, attrs)
@@ -679,7 +679,7 @@ class ModelSerializer(Serializer):
def get_fields(self):
declared_fields = copy.deepcopy(self._declared_fields)
- ret = SortedDict()
+ ret = OrderedDict()
model = getattr(self.Meta, 'model')
fields = getattr(self.Meta, 'fields', None)
exclude = getattr(self.Meta, 'exclude', None)