diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-05 15:06:55 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-05 15:06:55 +0100 |
| commit | 33bf2fe92222a807b41682c9d9a537cb0f72bf34 (patch) | |
| tree | 5ec20d0de0ee8673d18feb9257ddd3b610ed2c01 /odoo | |
| parent | ed1740a6b7ae01eb352386bfa23f99b53bd1d02e (diff) | |
| parent | aed8f4534675eb75b3ef2097d729e9f6fd102cf2 (diff) | |
[MERGE] forward port branch 11.0 up to aed8f453467
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/cli/shell.py | 1 | ||||
| -rw-r--r-- | odoo/tools/translate.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/odoo/cli/shell.py b/odoo/cli/shell.py index e75e453a231..a7e7d10ec56 100644 --- a/odoo/cli/shell.py +++ b/odoo/cli/shell.py @@ -63,6 +63,7 @@ class Shell(Command): def console(self, local_vars): if not os.isatty(sys.stdin.fileno()): + local_vars['__name__'] = '__main__' exec(sys.stdin.read(), local_vars) else: if 'env' not in local_vars: diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py index 4690bd142f1..e6dc561188b 100644 --- a/odoo/tools/translate.py +++ b/odoo/tools/translate.py @@ -696,7 +696,7 @@ def trans_export(lang, modules, buffer, format, cr): tmpmoddir = join(tmpdir, mod, 'i18n') os.makedirs(tmpmoddir) pofilename = (lang if lang else mod) + ".po" + ('t' if not lang else '') - buf = open(join(tmpmoddir, pofilename), 'w') + buf = open(join(tmpmoddir, pofilename), 'wb') _process('po', [mod], modrows, buf, lang) buf.close() |