Ticket #5903: decimal_field_default_5903.patch

django/utils/encoding.py

@@ -4 +4 @@
 
 from django.utils.functional import Promise
 from django.utils.safestring import SafeData, mark_safe
+try:
+    import decimal
+except ImportError:
+    from django.utils import _decimal as decimal    # for Python 2.3
 
 class DjangoUnicodeDecodeError(UnicodeDecodeError):
     def __init__(self, obj, *args):
@@ -43 +47 @@
 
     If strings_only is True, don't convert (some) non-string-like objects.
     """
-    if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.date, datetime.time, float)):
+    if strings_only and isinstance(s, (types.NoneType, int, long, datetime.datetime, datetime.date, datetime.time, float, decimal.Decimal)):
         return s
     try:
         if not isinstance(s, basestring,):

tests/regressiontests/model_fields/tests.py

@@ -15 +15 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'This value must be a decimal number.']
+
+# test default value
+>>> import decimal
+>>> f = DecimalField(default=decimal.Decimal("0.00"))
+>>> f.get_default()
+Decimal("0.00")
 """