Author: russellm
Date: 2010-04-19 06:57:04 -0500 (Mon, 19 Apr 2010)
New Revision: 12999
Modified:
django/branches/releases/1.1.X/django/core/management/commands/makemessages.py
Log:
[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.
Modified:
django/branches/releases/1.1.X/django/core/management/commands/makemessages.py
===================================================================
---
django/branches/releases/1.1.X/django/core/management/commands/makemessages.py
2010-04-19 11:52:56 UTC (rev 12998)
+++
django/branches/releases/1.1.X/django/core/management/commands/makemessages.py
2010-04-19 11:57:04 UTC (rev 12999)
@@ -125,7 +125,11 @@
src = open(os.path.join(dirpath, file), "rU").read()
src = pythonize_re.sub('\n#', src)
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))
(stdin, stdout, stderr) = os.popen3(cmd, 't')
msgs = stdout.read()
@@ -141,7 +145,11 @@
else:
msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
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))
elif domain == 'django' and (file_ext == '.py' or file_ext in
extensions):
thefile = file
@@ -149,7 +157,11 @@
src = open(os.path.join(dirpath, file), "rU").read()
thefile = '%s.py' % file
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:
msg = "%s (file: %s)" % (msg, os.path.join(dirpath,
file))
raise SyntaxError(msg)
@@ -176,7 +188,11 @@
else:
msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8')
if msgs:
- open(potfile, 'ab').write(msgs)
+ f = open(potfile, 'ab')
+ try:
+ f.write(msgs)
+ finally:
+ f.close()
if thefile != file:
os.unlink(os.path.join(dirpath, thefile))
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
