Permalink
Browse files

[soc2009/model-validation] DecimalField done

  • Loading branch information...
1 parent 08652c8 commit 795cd55ba29cecae6e06ff1efa06051cabc81f5f @HonzaKral HonzaKral committed Jun 3, 2009
Showing with 9 additions and 3 deletions.
  1. +9 −3 django/forms/fields.py
View
12 django/forms/fields.py
@@ -208,6 +208,8 @@ def to_python(self, value):
def validate(self, value):
super(IntegerField, self).validate(value)
+ if value in EMPTY_VALUES:
+ return
if self.max_value is not None and value > self.max_value:
raise ValidationError(self.error_messages['max_value'] % self.max_value)
if self.min_value is not None and value < self.min_value:
@@ -250,22 +252,26 @@ def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_plac
self.max_digits, self.decimal_places = max_digits, decimal_places
Field.__init__(self, *args, **kwargs)
- def clean(self, value):
+ def to_python(self, value):
"""
Validates that the input is a decimal number. Returns a Decimal
instance. Returns None for empty values. Ensures that there are no more
than max_digits in the number, and no more than decimal_places digits
after the decimal point.
"""
- super(DecimalField, self).clean(value)
- if not self.required and value in EMPTY_VALUES:
+ if value in EMPTY_VALUES:
return None
value = smart_str(value).strip()
try:
value = Decimal(value)
except DecimalException:
raise ValidationError(self.error_messages['invalid'])
+ return value
+ def validate(self, value):
+ super(DecimalField, self).validate(value)
+ if value in EMPTY_VALUES:
+ return
sign, digittuple, exponent = value.as_tuple()
decimals = abs(exponent)
# digittuple doesn't include any leading zeros.

0 comments on commit 795cd55

Please sign in to comment.