Ticket #5232: decimalfield.diff

django/core/validators.py

@@ -423 +423 @@
-        except DecimalException:
-            raise ValidationError, _("Please enter a valid decimal number.")
-
-
+lstrip("-").
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])
-

django/newforms/fields.py

@@ -190 +190 @@
-            value = Decimal(value)
-        except DecimalException:
-            raise ValidationError(ugettext('Enter a number.'))
-
+lstrip("-").
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])
-        if self.max_value is not None and value > self.max_value:

tests/regressiontests/forms/tests.py

@@ -1167 +1167 @@
-Traceback (most recent call last):
-...
-ValidationError: [u'Ensure that there are no more than 2 digits before the decimal point.']
+>>> f.clean('-123.45')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 4 digits in total.']
+>>> f.clean('-12.34')
+Decimal("-12.34")
->>> f = DecimalField(max_digits=4, decimal_places=2, required=False)
->>> f.clean('')
-