Skip to content

Commit e4e3f57

Browse files
author
kazmiruk
committed
fix test for OrderedDict
1 parent 51650f8 commit e4e3f57

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/test_fields.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"""
44
from __future__ import unicode_literals
55

6+
from collections import OrderedDict
67
import datetime
78
import re
89
from decimal import Decimal
910
from uuid import uuid4
1011
from django.core import validators
1112
from django.db import models
1213
from django.test import TestCase
13-
from django.utils.datastructures import SortedDict
1414
from rest_framework import serializers
1515
from tests.models import RESTFrameworkModel
1616

@@ -95,7 +95,7 @@ def test_dict_field_ordering(self):
9595
Field should preserve dictionary ordering, if it exists.
9696
See: https://github.com/tomchristie/django-rest-framework/issues/832
9797
"""
98-
ret = SortedDict()
98+
ret = OrderedDict()
9999
ret['c'] = 1
100100
ret['b'] = 1
101101
ret['a'] = 1

tests/test_serializer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ def test_pickle_simple_model_serializer_data(self):
12971297

12981298
def test_pickle_inner_serializer(self):
12991299
"""
1300-
Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will
1300+
Test pickling a serializer whose resulting .data (a OrderedDictWithMetadata) will
13011301
have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
13021302
See DictWithMetadata.__getstate__
13031303
"""
@@ -1312,13 +1312,13 @@ def test_getstate_method_should_not_return_none(self):
13121312
Regression test for #645.
13131313
"""
13141314
data = serializers.DictWithMetadata({1: 1})
1315-
self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1}))
1315+
self.assertEqual(data.__getstate__(), serializers.OrderedDict({1: 1}))
13161316

13171317
def test_serializer_data_is_pickleable(self):
13181318
"""
13191319
Another regression test for #645.
13201320
"""
1321-
data = serializers.SortedDictWithMetadata({1: 1})
1321+
data = serializers.OrderedDictWithMetadata({1: 1})
13221322
repr(pickle.loads(pickle.dumps(data, 0)))
13231323

13241324

0 commit comments

Comments
 (0)