From edc5a3904fd983a8d0a27fbd4e07eda914169cbc Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 2 Sep 2011 12:49:20 +0200 Subject: [PATCH] [IMP] check if handler returned a response already: just wrap return value if it's a string, otherwise let it through as is bzr revid: xmo@openerp.com-20110902104920-c0cpwmg62y70tx1b --- addons/base/common/dispatch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base/common/dispatch.py b/addons/base/common/dispatch.py index 3f35a09f7fa..2d1611e1731 100644 --- a/addons/base/common/dispatch.py +++ b/addons/base/common/dispatch.py @@ -253,12 +253,12 @@ class Root(object): result = handler( request, self.config) - if isinstance(result, werkzeug.wrappers.Response): - response = result - else: + if isinstance(result, basestring): response = werkzeug.wrappers.Response( result, headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]) + else: + response = result response.set_cookie(self.session_cookie, session.sid)