Changeset 6067

Timestamp:

09/08/07 14:24:46 (1 year ago)

Author:

gwilson

Message:

Fixed #5232 -- Fixed the validation of DecimalField so that the negative sign is not counted as a digit. Thanks, Andrew Durdin.

Files:

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

django/trunk/django/core/validators.py

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

django/trunk/django/newforms/fields.py

@@ -191 +191 @@
-        except DecimalException:
-            raise ValidationError(ugettext('Enter a number.'))
-
+lstrip("-").
-        decimals = (len(pieces) == 2) and len(pieces[1]) or 0
-        digits = len(pieces[0])

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

@@ -1168 +1168 @@
-...
-ValidationError: [u'Ensure that there are no more than 2 digits before the decimal point.']
+>>> f.clean('-12.34')
+Decimal("-12.34")
+>>> 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')
+Decimal("-0.12")
+>>> f.clean('-00.12')
+Decimal("-0.12")
+>>> f.clean('-000.12')
+Decimal("-0.12")
+>>> f.clean('-000.123')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 2 decimal places.']
+>>> f.clean('-000.1234')
+Traceback (most recent call last):
+...
+ValidationError: [u'Ensure that there are no more than 4 digits in total.']
+>>> f.clean('--0.12')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a number.']
+
->>> f = DecimalField(max_digits=4, decimal_places=2, required=False)
->>> f.clean('')