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

Merge pull request #296 from ulmus/restframework2

Browse Source 
Removed serializers.TextField and related tests
This commit is contained in:
Tom Christie 2012-10-15 06:04:55 -07:00
commit 4fe734a91a
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

@ -409,13 +409,6 @@ class BooleanField(WritableField):
return False return False
raise ValidationError(self.error_messages['invalid'] % value) raise ValidationError(self.error_messages['invalid'] % value)
class TextField(WritableField):
type_name = 'TextField'
def from_native(self, value):
if isinstance(value, basestring) or value is None:
return value
return smart_unicode(value)
class CharField(WritableField): class CharField(WritableField):
type_name = 'CharField' type_name = 'CharField'

29
rest_framework/tests/serializer.py
View File

@ -28,26 +28,6 @@ class CommentSerializer(serializers.Serializer):
return instance return instance
class LongText(object):
def __init__(self, content):
self.content = content
def __eq__(self, other):
return all([getattr(self, attr) == getattr(other, attr)
for attr in ('content',)])
class LongTextSerializer(serializers.Serializer):
content = serializers.TextField()
def restore_object(self, data, instance=None):
if instance is None:
return LongText(**data)
for key, val in data.items():
setattr(instance, key, val)
return instance
class BasicTests(TestCase): class BasicTests(TestCase):
def setUp(self): def setUp(self):
self.comment = Comment( self.comment = Comment(
@ -102,7 +82,6 @@ class ValidationTests(TestCase):
'content': 'x' * 1001, 'content': 'x' * 1001,
'created': datetime.datetime(2012, 1, 1) 'created': datetime.datetime(2012, 1, 1)
} }
self.long_text = LongText('test test test test')
def test_create(self): def test_create(self):
serializer = CommentSerializer(self.data) serializer = CommentSerializer(self.data)
@ -123,14 +102,6 @@ class ValidationTests(TestCase):
self.assertEquals(serializer.is_valid(), False) self.assertEquals(serializer.is_valid(), False)
self.assertEquals(serializer.errors, {'email': [u'This field is required.']}) self.assertEquals(serializer.errors, {'email': [u'This field is required.']})
def test_update_long_text(self):
data = {
'content' : 'Lorem ipsum dolor sit amet.'
}
serializer = LongTextSerializer(data, self.long_text)
self.assertEquals(serializer.is_valid(), True)
self.assertEquals(data['content'], self.long_text.content)
class MetadataTests(TestCase): class MetadataTests(TestCase):
def test_empty(self): def test_empty(self):