mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

unicode: Changed StrAndUnicode class to be consistent with everything else as

Browse Source 
to the encoding of bytestrings.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-04-27 08:29:08 +00:00
parent ee0bc3b6c8
commit 080cebaf69
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/encoding.py
View File

@ -47,13 +47,10 @@ def smart_str(s, encoding='utf-8', strings_only=False):
class StrAndUnicode(object):
"""
A class whose __str__ returns its __unicode__ as a bytestring
according to settings.DEFAULT_CHARSET.
A class whose __str__ returns its __unicode__ as a UTF-8 bytestring.
Useful as a mix-in.
"""
def __str__(self):
# XXX: (Malcolm) Correct encoding? Be variable and use UTF-8 as
# default?
return self.__unicode__().encode(settings.DEFAULT_CHARSET)
return self.__unicode__().encode('utf-8')