test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensured that `makemessages` doesn't leave any temporary file over if the parsing of a template file fails. Refs #8536. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip 2011-12-21 15:35:58 +00:00
parent 39109b0e44
commit 45e3dff5ac
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/management/commands/makemessages.py
View File

@ -229,9 +229,10 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False,
if file_ext in extensions: if file_ext in extensions:
src = open(orig_file, "rU").read() src = open(orig_file, "rU").read()
thefile = '%s.py' % file thefile = '%s.py' % file
content = templatize(src, orig_file[2:])
f = open(os.path.join(dirpath, thefile), "w") f = open(os.path.join(dirpath, thefile), "w")
try: try:
f.write(templatize(src, orig_file[2:])) f.write(content)
finally: finally:
f.close() f.close()
if verbosity > 1: if verbosity > 1:

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

@ -108,16 +108,14 @@ class BasicExtractorTests(ExtractorTests):
os.chdir(self.test_dir) os.chdir(self.test_dir)
shutil.copyfile('./templates/template_with_error.tpl', './templates/template_with_error.html') shutil.copyfile('./templates/template_with_error.tpl', './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: with self.assertRaises(SyntaxError) as context_manager:
management.call_command('makemessages', locale=LOCALE, verbosity=0) management.call_command('makemessages', locale=LOCALE, verbosity=0)
except SyntaxError, e: self.assertRegexpMatches(str(context_manager.exception),
self.assertRegexpMatches(
str(e),
r'Translation blocks must not include other block tags: blocktrans \(file templates[/\\]template_with_error\.html, line 3\)' r'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') # Check that the temporary file was cleaned up
os.remove('./templates/template_with_error.html.py') # Waiting for #8536 to be fixed self.assertFalse(os.path.exists('./templates/template_with_error.html.py'))
def test_template_message_context_extractor(self): def test_template_message_context_extractor(self):
""" """