Django

Code

Changeset 1953

Show
Ignore:
Timestamp:
01/13/06 14:57:30 (3 years ago)
Author:
hugo
Message:

fixed #1221 - changed usage of wrong settings variable DEFAULT_ENCODING to the correct DEFAULT_CHARSET.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/utils/text.py

    r1529 r1953  
    101101 
    102102    if type(s) == str: 
    103         s = s.decode(DEFAULT_ENCODING) 
     103        s = s.decode(DEFAULT_CHARSET) 
    104104    elif type(s) != unicode: 
    105105        raise TypeError, s