encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 09:36:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes tests for renamed SortedDict

Browse Source
This commit is contained in:
kazmiruk 2015-04-23 16:32:36 +07:00
parent be66e15c1c
commit 73e433ed5c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_fields.py
View File

@ -11,13 +11,9 @@ 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 rest_framework import serializers from rest_framework import serializers
from rest_framework.compat import SortedDict
from tests.models import RESTFrameworkModel from tests.models import RESTFrameworkModel
try:
from collections import OrderedDict
except ImportError:
from django.utils.datastructures import SortedDict as OrderedDict
class TimestampedModel(models.Model): class TimestampedModel(models.Model):
added = models.DateTimeField(auto_now_add=True) added = models.DateTimeField(auto_now_add=True)
@ -99,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 = OrderedDict() ret = SortedDict()
ret['c'] = 1 ret['c'] = 1
ret['b'] = 1 ret['b'] = 1
ret['a'] = 1 ret['a'] = 1

2
tests/test_serializer.py
View File

@ -1312,7 +1312,7 @@ 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.OrderedDict({1: 1})) self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1}))
def test_serializer_data_is_pickleable(self): def test_serializer_data_is_pickleable(self):
""" """