encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use Serializer instead of ModelSerializer

Browse Source
This commit is contained in:
Piotr Jakimiak 2014-09-05 14:08:11 +02:00
parent 6022b9ddd4
commit c3b841ae44
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/fields.py
View File

@ -479,8 +479,7 @@ class CharField(WritableField):
if not self.allow_none: if not self.allow_none:
return '' return ''
else: else:
# return None explicitly because smart_text(None) == 'None' # Return None explicitly because smart_text(None) == 'None'. See #1834 for details
# see #1834 for details
return None return None
return smart_text(value) return smart_text(value)

11
tests/test_fields.py
View File

@ -54,10 +54,6 @@ class ChoiceFieldModel(models.Model):
choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255)
class NullableCharFieldModel(models.Model):
char = models.CharField(null=True, blank=True, max_length=4)
class ChoiceFieldModelSerializer(serializers.ModelSerializer): class ChoiceFieldModelSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = ChoiceFieldModel model = ChoiceFieldModel
@ -1013,13 +1009,12 @@ class ModelCharField(TestCase):
Tests for CharField Tests for CharField
""" """
def test_none_serializing(self): def test_none_serializing(self):
class CharFieldSerializer(serializers.ModelSerializer): class CharFieldSerializer(serializers.Serializer):
class Meta: char = serializers.CharField(allow_none=True, required=False)
model = NullableCharFieldModel
serializer = CharFieldSerializer(data={'char': None}) serializer = CharFieldSerializer(data={'char': None})
self.assertTrue(serializer.fields['char'].allow_none) self.assertTrue(serializer.fields['char'].allow_none)
self.assertTrue(serializer.is_valid()) self.assertTrue(serializer.is_valid())
self.assertIsNone(serializer.object.char) self.assertIsNone(serializer.object['char'])
class SerializerMethodFieldTest(TestCase): class SerializerMethodFieldTest(TestCase):