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

Deal with None and missing values

Browse Source
This commit is contained in:
Tom Christie 2012-10-29 14:10:38 +00:00
parent dfcb560f8f
commit 49f87cfbab
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rest_framework/fields.py
View File

@ -509,7 +509,10 @@ class EmailField(CharField):
default_validators = [validators.validate_email] default_validators = [validators.validate_email]
def from_native(self, value): def from_native(self, value):
return super(EmailField, self).from_native(value).strip() ret = super(EmailField, self).from_native(value)
if ret is None:
return None
return ret.strip()
def __deepcopy__(self, memo): def __deepcopy__(self, memo):
result = copy.copy(self) result = copy.copy(self)
@ -531,8 +534,9 @@ class DateField(WritableField):
empty = None empty = None
def from_native(self, value): def from_native(self, value):
if value is None: if value in validators.EMPTY_VALUES:
return value return None
if isinstance(value, datetime.datetime): if isinstance(value, datetime.datetime):
if timezone and settings.USE_TZ and timezone.is_aware(value): if timezone and settings.USE_TZ and timezone.is_aware(value):
# Convert aware datetimes to the default time zone # Convert aware datetimes to the default time zone
@ -570,8 +574,9 @@ class DateTimeField(WritableField):
empty = None empty = None
def from_native(self, value): def from_native(self, value):
if value is None: if value in validators.EMPTY_VALUES:
return value return None
if isinstance(value, datetime.datetime): if isinstance(value, datetime.datetime):
return value return value
if isinstance(value, datetime.date): if isinstance(value, datetime.date):
@ -629,6 +634,7 @@ class IntegerField(WritableField):
def from_native(self, value): def from_native(self, value):
if value in validators.EMPTY_VALUES: if value in validators.EMPTY_VALUES:
return None return None
try: try:
value = int(str(value)) value = int(str(value))
except (ValueError, TypeError): except (ValueError, TypeError):
@ -644,8 +650,9 @@ class FloatField(WritableField):
} }
def from_native(self, value): def from_native(self, value):
if value is None: if value in validators.EMPTY_VALUES:
return value return None
try: try:
return float(value) return float(value)
except (TypeError, ValueError): except (TypeError, ValueError):