From 8b4dffd8df93610688552e45d4752cad79ff3fcc Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sat, 15 Jan 2011 00:18:15 +0000 Subject: [PATCH] Modified a try block construct in a test case to be compatible with Python 2.4. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15209 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/i18n/commands/extraction.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/regressiontests/i18n/commands/extraction.py b/tests/regressiontests/i18n/commands/extraction.py index 9061863e67..f17bb47197 100644 --- a/tests/regressiontests/i18n/commands/extraction.py +++ b/tests/regressiontests/i18n/commands/extraction.py @@ -63,10 +63,11 @@ class BasicExtractorTests(ExtractorTests): os.chdir(self.test_dir) shutil.copyfile('./templates/template_with_error.txt', './templates/template_with_error.html') self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, verbosity=0) - try: - management.call_command('makemessages', locale=LOCALE, verbosity=0) - except SyntaxError, e: - self.assertEqual(str(e), 'Translation blocks must not include other block tags: blocktrans (file templates/template_with_error.html, line 3)') + try: # TODO: Simplify this try/try block when we drop support for Python 2.4 + try: + management.call_command('makemessages', locale=LOCALE, verbosity=0) + except SyntaxError, e: + self.assertEqual(str(e), 'Translation blocks must not include other block tags: blocktrans (file templates/template_with_error.html, line 3)') finally: os.remove('./templates/template_with_error.html') os.remove('./templates/template_with_error.html.py') # Waiting for #8536 to be fixed