Ticket #8290: 8290_decimal_field_clean.diff

django/forms/fields.py

@@ -244 +244 @@
             value = Decimal(value)
         except DecimalException:
             raise ValidationError(self.error_messages['invalid'])
-        pieces = str(value).lstrip("-").split('.')
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])
+        sign, digittuple, exponent = value.as_tuple()
+        decimals = exponent * -1
+        digits = (len(digittuple) - decimals) or 1
         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:

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.']
+
 # DateField ###################################################################
 
 >>> import datetime