diff options
| author | Danilo Šegan <danilo@src.gnome.org> | 2007-03-02 09:41:10 +0000 |
|---|---|---|
| committer | Danilo Šegan <danilo@src.gnome.org> | 2007-03-02 09:41:10 +0000 |
| commit | d91d0dc0749db748e8968f3e12d59bb1be724ad1 (patch) | |
| tree | bc886011f75b97a3e73be4250ebef90cd674f6fb /xml2po | |
| parent | 82869fda04d61d24221f00a13e598ed9c7e02571 (diff) | |
| download | gnome-doc-utils-d91d0dc0749db748e8968f3e12d59bb1be724ad1.tar.gz | |
Fix bug #413602: overwriting of file keyword.
svn path=/trunk/; revision=892
Diffstat (limited to 'xml2po')
| -rw-r--r-- | xml2po/ChangeLog | 6 | ||||
| -rwxr-xr-x | xml2po/xml2po.py | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/xml2po/ChangeLog b/xml2po/ChangeLog index e845c1b..5d7337b 100644 --- a/xml2po/ChangeLog +++ b/xml2po/ChangeLog @@ -1,3 +1,9 @@ +2007-03-02 Danilo Šegan <danilo@gnome.org> + + * Fix #413602: Use mfile variable name instead of file, thus + overwriting file() call used later. + Patch by Eduardo Habkost <ehabkost@raisama.net>. + 2006-12-26 Danilo Šegan <danilo@gnome.org> * xml2po.py (autoNodeIsFinal): Cache autoNodeIsFinal value. diff --git a/xml2po/xml2po.py b/xml2po/xml2po.py index 59dcb61..c6bc9a3 100755 --- a/xml2po/xml2po.py +++ b/xml2po/xml2po.py @@ -812,9 +812,9 @@ if mode=='merge' and mofile=='': if mofile: try: - file = open(mofile, "rb") + mfile = open(mofile, "rb") - gt = gettext.GNUTranslations(file) + gt = gettext.GNUTranslations(mfile) gt.add_fallback(NoneTranslations()) except: print >> sys.stderr, "Can't open MO file '%s'." % (mofile) |