diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-10 19:14:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-10 19:14:30 +0200 |
| commit | 0be264b29eac11a5dec5e6565d23d4ea86bd905a (patch) | |
| tree | 79362f2340c89cb3cf2e8d8a467f357b7c7a8326 /odoo/tools/misc.py | |
| parent | cf753a7fdf1739dcf37d2ad74f4c8efb3d4ff3b3 (diff) | |
| parent | e1104ac344cbc349a46b22339b13dfe9cbab8bcb (diff) | |
[MERGE] forward port branch 11.0 up to e1104ac344c
Diffstat (limited to 'odoo/tools/misc.py')
| -rw-r--r-- | odoo/tools/misc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py index 7e796831f29..49f8024c5ed 100644 --- a/odoo/tools/misc.py +++ b/odoo/tools/misc.py @@ -215,7 +215,10 @@ def _fileopen(path, mode, basedir, pathinfo, basename=None): # Give higher priority to module directories, which is # a more common case than zipped modules. if os.path.isfile(name): - fo = open(name, mode) + if 'b' in mode: + fo = open(name, mode) + else: + fo = io.open(name, mode, encoding='utf-8') if pathinfo: return fo, name return fo |