Ticket #5355: 5355.diff

django/newforms/fields.py

@@ -192 +192 @@
         super(DecimalField, self).clean(value)
         if not self.required and value in EMPTY_VALUES:
             return None
-        value = value.strip()
         try:
             value = Decimal(value)
         except DecimalException:

tests/regressiontests/forms/tests.py

@@ -961 +961 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'Enter a whole number.']
+>>> f.clean(42)
+42
+>>> f.clean(3.14)
+3
 >>> f.clean('1 ')
 1
 >>> f.clean(' 1')
@@ -1084 +1088 @@
 23.0
 >>> 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 +1150 @@
 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')
 Traceback (most recent call last):
 ...