Author: russellm
Date: 2010-04-19 06:52:56 -0500 (Mon, 19 Apr 2010)
New Revision: 12998
Modified:
django/trunk/django/core/management/commands/makemessages.py
django/trunk/tests/regressiontests/forms/localflavor/se.py
Log:
Fixed #13374 -- Corrected some more minor issues causing problems for PyPy.
Thanks to Alex Gaynor for the report and patch.
Modified: django/trunk/django/core/management/commands/makemessages.py
===================================================================
--- django/trunk/django/core/management/commands/makemessages.py
2010-04-19 10:16:25 UTC (rev 12997)
+++ django/trunk/django/core/management/commands/makemessages.py
2010-04-19 11:52:56 UTC (rev 12998)
@@ -185,7 +185,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))
msgs, errors = _popen(cmd)
if errors:
@@ -199,7 +203,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
@@ -207,7 +215,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)
@@ -229,7 +241,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))
@@ -237,14 +253,22 @@
msgs, errors = _popen('msguniq --to-code=utf-8 "%s"' % potfile)
if errors:
raise CommandError("errors happened while running msguniq\n%s"
% errors)
- open(potfile, 'w').write(msgs)
+ f = open(potfile, 'w')
+ try:
+ f.write(msgs)
+ finally:
+ f.close()
if os.path.exists(pofile):
msgs, errors = _popen('msgmerge -q "%s" "%s"' % (pofile,
potfile))
if errors:
raise CommandError("errors happened while running
msgmerge\n%s" % errors)
elif not invoked_for_django:
msgs = copy_plural_forms(msgs, locale, domain, verbosity)
- open(pofile, 'wb').write(msgs)
+ f = open(pofile, 'wb')
+ try:
+ f.write(msgs)
+ finally:
+ f.close()
os.unlink(potfile)
Modified: django/trunk/tests/regressiontests/forms/localflavor/se.py
===================================================================
--- django/trunk/tests/regressiontests/forms/localflavor/se.py 2010-04-19
10:16:25 UTC (rev 12997)
+++ django/trunk/tests/regressiontests/forms/localflavor/se.py 2010-04-19
11:52:56 UTC (rev 12998)
@@ -12,7 +12,7 @@
>>> olddate = datetime.date
>>> datetime.date = MockDate
>>> datetime.date.today()
-MockDate(2008, 5, 14)
+...MockDate(2008, 5, 14)
# SECountySelect #####################################################
--
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.
