Commit e4e3f573 by kazmiruk

fix test for OrderedDict

parent 51650f88
...@@ -3,6 +3,7 @@ General serializer field tests. ...@@ -3,6 +3,7 @@ General serializer field tests.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from collections import OrderedDict
import datetime import datetime
import re import re
from decimal import Decimal from decimal import Decimal
...@@ -10,7 +11,6 @@ from uuid import uuid4 ...@@ -10,7 +11,6 @@ from uuid import uuid4
from django.core import validators from django.core import validators
from django.db import models from django.db import models
from django.test import TestCase from django.test import TestCase
from django.utils.datastructures import SortedDict
from rest_framework import serializers from rest_framework import serializers
from tests.models import RESTFrameworkModel from tests.models import RESTFrameworkModel
...@@ -95,7 +95,7 @@ class BasicFieldTests(TestCase): ...@@ -95,7 +95,7 @@ class BasicFieldTests(TestCase):
Field should preserve dictionary ordering, if it exists. Field should preserve dictionary ordering, if it exists.
See: https://github.com/tomchristie/django-rest-framework/issues/832 See: https://github.com/tomchristie/django-rest-framework/issues/832
""" """
ret = SortedDict() ret = OrderedDict()
ret['c'] = 1 ret['c'] = 1
ret['b'] = 1 ret['b'] = 1
ret['a'] = 1 ret['a'] = 1
......
...@@ -1297,7 +1297,7 @@ class SerializerPickleTests(TestCase): ...@@ -1297,7 +1297,7 @@ class SerializerPickleTests(TestCase):
def test_pickle_inner_serializer(self): def test_pickle_inner_serializer(self):
""" """
Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will Test pickling a serializer whose resulting .data (a OrderedDictWithMetadata) will
have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle. have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
See DictWithMetadata.__getstate__ See DictWithMetadata.__getstate__
""" """
...@@ -1312,13 +1312,13 @@ class SerializerPickleTests(TestCase): ...@@ -1312,13 +1312,13 @@ class SerializerPickleTests(TestCase):
Regression test for #645. Regression test for #645.
""" """
data = serializers.DictWithMetadata({1: 1}) data = serializers.DictWithMetadata({1: 1})
self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1})) self.assertEqual(data.__getstate__(), serializers.OrderedDict({1: 1}))
def test_serializer_data_is_pickleable(self): def test_serializer_data_is_pickleable(self):
""" """
Another regression test for #645. Another regression test for #645.
""" """
data = serializers.SortedDictWithMetadata({1: 1}) data = serializers.OrderedDictWithMetadata({1: 1})
repr(pickle.loads(pickle.dumps(data, 0))) repr(pickle.loads(pickle.dumps(data, 0)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment