summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2016-11-14 22:27:53 +0100
committerNicolas Lempereur <nle@odoo.com>2016-11-14 22:44:34 +0100
commitf2abde5659aa087ff8834140147f8d3be3bcdb3e (patch)
tree38e4e5d1b2ca5e6701c6667235c46d7eada2924c
parent7be6c7404a09425f50fd7055dfb66f8b7b5dcf7e (diff)
[FIX] base: binary url attachment on windows
On windows when opening a binary file a 'b' flag is to be used: https://docs.python.org/2/tutorial/inputoutput.html#reading-and-writing-files Before this commit, /web/image/* and /web/content/* routes serving an ir.attachment with url could return empty or truncated content. opw-693306
-rw-r--r--openerp/addons/base/ir/ir_http.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index dde75a64a76..2ff316f1ea1 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -264,7 +264,7 @@ class ir_http(osv.AbstractModel):
module_path = os.path.join(os.path.normpath(module_path), '') # join ensures the path ends with '/'
module_resource_path = os.path.normpath(module_resource_path)
if module_resource_path.startswith(module_path):
- with open(module_resource_path, 'r') as f:
+ with open(module_resource_path, 'rb') as f:
content = base64.b64encode(f.read())
last_update = str(os.path.getmtime(module_resource_path))