Skip to content

Commit 73e433e

Browse files
author
kazmiruk
committed
fixes tests for renamed SortedDict
1 parent be66e15 commit 73e433e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

tests/test_fields.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111
from django.db import models
1212
from django.test import TestCase
1313
from rest_framework import serializers
14+
from rest_framework.compat import SortedDict
1415
from tests.models import RESTFrameworkModel
1516

16-
try:
17-
from collections import OrderedDict
18-
except ImportError:
19-
from django.utils.datastructures import SortedDict as OrderedDict
20-
2117

2218
class TimestampedModel(models.Model):
2319
added = models.DateTimeField(auto_now_add=True)
@@ -99,7 +95,7 @@ def test_dict_field_ordering(self):
9995
Field should preserve dictionary ordering, if it exists.
10096
See: https://github.com/tomchristie/django-rest-framework/issues/832
10197
"""
102-
ret = OrderedDict()
98+
ret = SortedDict()
10399
ret['c'] = 1
104100
ret['b'] = 1
105101
ret['a'] = 1

tests/test_serializer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ 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.OrderedDict({1: 1}))
1315+
self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1}))
13161316

13171317
def test_serializer_data_is_pickleable(self):
13181318
"""

0 commit comments

Comments
 (0)