adds backward compatibility

kazmiruk · kazmiruk · commit 47c61679a58a · 2015-04-22T13:43:16.000+07:00
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -30,6 +30,11 @@
 )
 from rest_framework.settings import api_settings
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 def is_simple_callable(obj):
     """
@@ -224,7 +229,7 @@ def to_native(self, value):
             return [self.to_native(item) for item in value]
         elif isinstance(value, dict):
             # Make sure we preserve field ordering, if it exists
-            ret = collections.OrderedDict()
+            ret = OrderedDict()
             for key, val in value.items():
                 ret[key] = self.to_native(val)
             return ret
@@ -239,7 +244,7 @@ def attributes(self):
         return {}
 
     def metadata(self):
-        metadata = collections.OrderedDict()
+        metadata = OrderedDict()
         metadata['type'] = self.type_label
         metadata['required'] = getattr(self, 'required', False)
         optional_attrs = ['read_only', 'label', 'help_text',
diff --git a/rest_framework/routers.py b/rest_framework/routers.py
@@ -16,7 +16,7 @@
 from __future__ import unicode_literals
 
 import itertools
-from collections import namedtuple, OrderedDict
+from collections import namedtuple
 from django.conf.urls import patterns, url
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import NoReverseMatch
@@ -25,6 +25,11 @@
 from rest_framework.reverse import reverse
 from rest_framework.urlpatterns import format_suffix_patterns
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 Route = namedtuple('Route', ['url', 'mapping', 'name', 'initkwargs'])
 DynamicDetailRoute = namedtuple('DynamicDetailRoute', ['url', 'name', 'initkwargs'])
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -11,7 +11,6 @@
 response content is handled by parsers and renderers.
 """
 from __future__ import unicode_literals
-from collections import OrderedDict
 import copy
 import datetime
 import inspect
@@ -37,6 +36,11 @@
 from rest_framework.relations import *  # NOQA
 from rest_framework.fields import *  # NOQA
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 def _resolve_model(obj):
     """
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
@@ -2,7 +2,6 @@
 Helper classes for parsers.
 """
 from __future__ import unicode_literals
-from collections import OrderedDict
 from django.utils import timezone
 from django.db.models.query import QuerySet
 from django.utils.functional import Promise
@@ -13,6 +12,11 @@
 import types
 import json
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 class JSONEncoder(json.JSONEncoder):
     """
diff --git a/rest_framework/views.py b/rest_framework/views.py
@@ -3,7 +3,6 @@
 """
 from __future__ import unicode_literals
 
-from collections import OrderedDict
 from django.core.exceptions import PermissionDenied
 from django.http import Http404
 from django.views.decorators.csrf import csrf_exempt
@@ -14,6 +13,11 @@
 from rest_framework.settings import api_settings
 from rest_framework.utils import formatting
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 def get_view_name(view_cls, suffix=None):
     """
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -3,7 +3,6 @@
 """
 from __future__ import unicode_literals
 
-from collections import OrderedDict
 import datetime
 import re
 from decimal import Decimal
@@ -14,6 +13,11 @@
 from rest_framework import serializers
 from tests.models import RESTFrameworkModel
 
+try:
+    from collections import OrderedDict
+except ImportError:
+    from django.utils.datastructures import SortedDict as OrderedDict
+
 
 class TimestampedModel(models.Model):
     added = models.DateTimeField(auto_now_add=True)
