innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Removed a Python 2.4 try/except no longer necessary in django.utils.translation.trans_real 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2011-03-28 02:31:31 +00:00
parent 0fdabe885b
commit b4f0c1a775
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/translation/trans_real.py
View File

@ -68,13 +68,7 @@ class DjangoTranslation(gettext_module.GNUTranslations):
""" """
def __init__(self, *args, **kw): def __init__(self, *args, **kw):
gettext_module.GNUTranslations.__init__(self, *args, **kw) gettext_module.GNUTranslations.__init__(self, *args, **kw)
# Starting with Python 2.4, there's a function to define
# the output charset. Before 2.4, the output charset is
# identical with the translation file charset.
try:
self.set_output_charset('utf-8') self.set_output_charset('utf-8')
except AttributeError:
pass
self.django_output_charset = 'utf-8' self.django_output_charset = 'utf-8'
self.__language = '??' self.__language = '??'