Changeset 8391

Timestamp:

08/15/08 15:09:47 (4 months ago)

Author:

gwilson

Message:

Fixed #8290 -- Fixed DecimalField?'s cleaning of values with a large number of decimal places, based on patch from dgouldin.

Files:

• django/trunk/django/forms/fields.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/fields.py (modified) (1 diff)

django/trunk/django/forms/fields.py

@@ -245 +245 @@
-        except DecimalException:
-            raise ValidationError(self.error_messages['invalid'])
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        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:
-            raise ValidationError(self.error_messages['min_value'] % self.min_value)
-(digits + decimals)
+digits
-            raise ValidationError(self.error_messages['max_digits'] % self.max_digits)
-        if self.decimal_places is not None and decimals > self.decimal_places:
-            raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places)
-
+whole_
-            raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places))
-        return value

django/trunk/tests/regressiontests/forms/fields.py

@@ -403 +403 @@
->>> f.clean('00.50') == Decimal("0.50")
-True
+
+
+>>> f = DecimalField(decimal_places=2)
+>>> f.clean('0.00000001')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 2 decimal places.']
+
+
+>>> f = DecimalField(max_digits=3)
+
+# Leading whole zeros "collapse" to one digit.
+>>> f.clean('0000000.10') == Decimal("0.1")
+True
+>>> f.clean('0000000.100')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 3 digits in total.']
+
+# Only leading whole zeros "collapse" to one digit.
+>>> f.clean('000000.02') == Decimal('0.02')
+True
+>>> f.clean('000000.002')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 3 digits in total.']
+
-
-# DateField ###################################################################