[MERGE] forward port of branch saas-3 up to 0f5b6cf

1 files changed, 4 insertions, 3 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 774b9cda712..3ebbfb02af6 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -35,6 +35,7 @@ from openerp.addons.base.ir.ir_qweb import AssetsBundle, QWebTemplateNotFound
 from openerp.modules import get_module_resource
 from openerp.tools import topological_sort
 from openerp.tools.translate import _
+from openerp.tools import ustr
 from openerp import http
 
 from openerp.http import request, serialize_exception as _serialize_exception
@@ -443,14 +444,14 @@ def xml2json_from_elementtree(el, preserve_whitespaces=False):
     return res
 
 def content_disposition(filename):
-    filename = filename.encode('utf8')
-    escaped = urllib2.quote(filename)
+    filename = ustr(filename)
+    escaped = urllib2.quote(filename.encode('utf8'))
     browser = request.httprequest.user_agent.browser
     version = int((request.httprequest.user_agent.version or '0').split('.')[0])
     if browser == 'msie' and version < 9:
         return "attachment; filename=%s" % escaped
     elif browser == 'safari':
-        return "attachment; filename=\"%s\"" % filename
+        return u"attachment; filename=%s" % filename
     else:
         return "attachment; filename*=UTF-8''%s" % escaped