p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ramiro Morales 2011-01-15 00:18:15 +00:00
parent 0bd628d418
commit 8b4dffd8df
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/regressiontests/i18n/commands/extraction.py
View File

@ -63,10 +63,11 @@ class BasicExtractorTests(ExtractorTests):
os.chdir(self.test_dir) os.chdir(self.test_dir)
shutil.copyfile('./templates/template_with_error.txt', './templates/template_with_error.html') shutil.copyfile('./templates/template_with_error.txt', './templates/template_with_error.html')
self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, verbosity=0) self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, verbosity=0)
try: try: # TODO: Simplify this try/try block when we drop support for Python 2.4
management.call_command('makemessages', locale=LOCALE, verbosity=0) try:
except SyntaxError, e: management.call_command('makemessages', locale=LOCALE, verbosity=0)
self.assertEqual(str(e), 'Translation blocks must not include other block tags: blocktrans (file templates/template_with_error.html, line 3)') 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: finally:
os.remove('./templates/template_with_error.html') os.remove('./templates/template_with_error.html')
os.remove('./templates/template_with_error.html.py') # Waiting for #8536 to be fixed os.remove('./templates/template_with_error.html.py') # Waiting for #8536 to be fixed