summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-05-15 20:18:14 +0200
committerChristophe Simonis <chs@odoo.com>2018-05-15 20:18:14 +0200
commitfa8a67ee5ff6b3bdc15d000bfda0c57350e01aa9 (patch)
tree13f57e095568fb456803f5d967b9e582eacd933c /addons/web/controllers
parent05ef2f24e08a06d586f9dc390878ecd3c069042f (diff)
parent5a943390f2abf82883316052ad0eeb601b0194c3 (diff)
[MERGE] forward port branch 11.0 up to 5a943390f2a
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2f5f2171a27..77d7304df12 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1116,7 +1116,7 @@ class Binary(http.Controller):
if request.httprequest.user_agent.browser == 'safari':
# Safari sends NFD UTF-8 (where é is composed by 'e' and [accent])
# we need to send it the same stuff, otherwise it'll fail
- filename = unicodedata.normalize('NFD', ufile.filename).encode('UTF-8')
+ filename = unicodedata.normalize('NFD', ufile.filename)
try:
attachment = Model.create({