Django

Code

Changeset 6746

Show
Ignore:
Timestamp:
11/29/07 13:30:38 (9 months ago)
Author:
mtredinnick
Message:

Fixed #6014 -- More robust error handling when validating decimal fields.
Thanks, pigletto.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/newforms/fields.py

    r6745 r6746  
    1818 
    1919from django.utils.translation import ugettext_lazy as _ 
    20 from django.utils.encoding import StrAndUnicode, smart_unicode 
     20from django.utils.encoding import StrAndUnicode, smart_unicode, smart_str 
    2121 
    2222from util import ErrorList, ValidationError 
     
    236236        if not self.required and value in EMPTY_VALUES: 
    237237            return None 
    238         value = str(value).strip() 
     238        value = smart_str(value).strip() 
    239239        try: 
    240240            value = Decimal(value) 
  • django/trunk/tests/regressiontests/forms/fields.py

    r6745 r6746  
    321321Decimal("3.14") 
    322322>>> f.clean('a') 
     323Traceback (most recent call last): 
     324... 
     325ValidationError: [u'Enter a number.'] 
     326>>> f.clean(u'łĠ
     327ść') 
    323328Traceback (most recent call last): 
    324329...