From b4f0c1a7759c8b96085411bea02cc9a539d6eaf5 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 28 Mar 2011 02:31:31 +0000 Subject: [PATCH] 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 --- django/utils/translation/trans_real.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index b8478354bde..f17eaf802b0 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -68,13 +68,7 @@ class DjangoTranslation(gettext_module.GNUTranslations): """ def __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') - except AttributeError: - pass + self.set_output_charset('utf-8') self.django_output_charset = 'utf-8' self.__language = '??'