Changeset 6282

Timestamp:

09/15/07 06:45:19 (10 months ago)

Author:

mtredinnick

Message:

Fixed #5355 -- Fixed data cleaning for DecimalField?.

In passing, fixed a problem with cleaning in IntegerField?.

Includes tests from PhiR.

Files:

• django/trunk/django/newforms/fields.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (3 diffs)

django/trunk/django/newforms/fields.py

@@ -145 +145 @@
-            return None
-        try:
-value
+str(value)
-        except (ValueError, TypeError):
-            raise ValidationError(ugettext(u'Enter a whole number.'))
@@ -193 +193 @@
-        if not self.required and value in EMPTY_VALUES:
-            return None
-value
+str(value)
-        try:
-            value = Decimal(value)

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

@@ -962 +962 @@
-...
-ValidationError: [u'Enter a whole number.']
+>>> f.clean(42)
+42
+>>> f.clean(3.14)
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a whole number.']
->>> f.clean('1 ')
-1
@@ -1085 +1091 @@
->>> f.clean('3.14')
-3.1400000000000001
+>>> f.clean(3.14)
+3.1400000000000001
+>>> f.clean(42)
+42.0
->>> f.clean('a')
-Traceback (most recent call last):
@@ -1142 +1152 @@
-Decimal("23")
->>> f.clean('3.14')
+Decimal("3.14")
+>>> f.clean(3.14)
+Decimal("3.14")
+>>> f.clean(Decimal('3.14'))
-Decimal("3.14")
->>> f.clean('a')