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

[1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch. 

Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-04-19 11:57:04 +00:00
parent be167b804d
commit f282099832
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,11 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False, extens
src = open(os.path.join(dirpath, file), "rU").read() src = open(os.path.join(dirpath, file), "rU").read()
src = pythonize_re.sub('\n#', src) src = pythonize_re.sub('\n#', src)
thefile = '%s.py' % file thefile = '%s.py' % file
open(os.path.join(dirpath, thefile), "w").write(src) f = open(os.path.join(dirpath, thefile), "w")
try:
f.write(src)
finally:
f.close()
cmd = 'xgettext -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (domain, os.path.join(dirpath, thefile)) cmd = 'xgettext -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (domain, os.path.join(dirpath, thefile))
(stdin, stdout, stderr) = os.popen3(cmd, 't') (stdin, stdout, stderr) = os.popen3(cmd, 't')
msgs = stdout.read() msgs = stdout.read()
@ -141,7 +145,11 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False, extens
else: else:
msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
if msgs: if msgs:
open(potfile, 'ab').write(msgs) f = open(potfile, 'ab')
try:
f.write(msgs)
finally:
f.close()
os.unlink(os.path.join(dirpath, thefile)) os.unlink(os.path.join(dirpath, thefile))
elif domain == 'django' and (file_ext == '.py' or file_ext in extensions): elif domain == 'django' and (file_ext == '.py' or file_ext in extensions):
thefile = file thefile = file
@ -149,7 +157,11 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False, extens
src = open(os.path.join(dirpath, file), "rU").read() src = open(os.path.join(dirpath, file), "rU").read()
thefile = '%s.py' % file thefile = '%s.py' % file
try: try:
open(os.path.join(dirpath, thefile), "w").write(templatize(src)) f = open(os.path.join(dirpath, thefile), "w")
try:
f.write(templatize(src))
finally:
f.close()
except SyntaxError, msg: except SyntaxError, msg:
msg = "%s (file: %s)" % (msg, os.path.join(dirpath, file)) msg = "%s (file: %s)" % (msg, os.path.join(dirpath, file))
raise SyntaxError(msg) raise SyntaxError(msg)
@ -176,7 +188,11 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False, extens
else: else:
msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
if msgs: if msgs:
open(potfile, 'ab').write(msgs) f = open(potfile, 'ab')
try:
f.write(msgs)
finally:
f.close()
if thefile != file: if thefile != file:
os.unlink(os.path.join(dirpath, thefile)) os.unlink(os.path.join(dirpath, thefile))