File tree 2 files changed +5
-5
lines changed 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 3
3
"""
4
4
from __future__ import unicode_literals
5
5
6
+ from collections import OrderedDict
6
7
import datetime
7
8
import re
8
9
from decimal import Decimal
9
10
from uuid import uuid4
10
11
from django .core import validators
11
12
from django .db import models
12
13
from django .test import TestCase
13
- from django .utils .datastructures import SortedDict
14
14
from rest_framework import serializers
15
15
from tests .models import RESTFrameworkModel
16
16
@@ -95,7 +95,7 @@ def test_dict_field_ordering(self):
95
95
Field should preserve dictionary ordering, if it exists.
96
96
See: https://github.com/tomchristie/django-rest-framework/issues/832
97
97
"""
98
- ret = SortedDict ()
98
+ ret = OrderedDict ()
99
99
ret ['c' ] = 1
100
100
ret ['b' ] = 1
101
101
ret ['a' ] = 1
Original file line number Diff line number Diff line change @@ -1297,7 +1297,7 @@ def test_pickle_simple_model_serializer_data(self):
1297
1297
1298
1298
def test_pickle_inner_serializer (self ):
1299
1299
"""
1300
- Test pickling a serializer whose resulting .data (a SortedDictWithMetadata ) will
1300
+ Test pickling a serializer whose resulting .data (a OrderedDictWithMetadata ) will
1301
1301
have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
1302
1302
See DictWithMetadata.__getstate__
1303
1303
"""
@@ -1312,13 +1312,13 @@ def test_getstate_method_should_not_return_none(self):
1312
1312
Regression test for #645.
1313
1313
"""
1314
1314
data = serializers .DictWithMetadata ({1 : 1 })
1315
- self .assertEqual (data .__getstate__ (), serializers .SortedDict ({1 : 1 }))
1315
+ self .assertEqual (data .__getstate__ (), serializers .OrderedDict ({1 : 1 }))
1316
1316
1317
1317
def test_serializer_data_is_pickleable (self ):
1318
1318
"""
1319
1319
Another regression test for #645.
1320
1320
"""
1321
- data = serializers .SortedDictWithMetadata ({1 : 1 })
1321
+ data = serializers .OrderedDictWithMetadata ({1 : 1 })
1322
1322
repr (pickle .loads (pickle .dumps (data , 0 )))
1323
1323
1324
1324
You can’t perform that action at this time.
0 commit comments