diff options
| author | Samus CTO <cto@openerp.com> | 2015-04-02 14:28:36 +0200 |
|---|---|---|
| committer | Samus CTO <cto@openerp.com> | 2015-04-02 14:28:36 +0200 |
| commit | 55a569e97072f601196bd2a9db8bf7e22253e85a (patch) | |
| tree | 780930754ef1b93c2e9b6ff3057e3a3fa2cb2273 | |
| parent | f4f9ab50624c933f0b2c70f108e586deddea9256 (diff) | |
[FIX] prevent exception to be raised during exception handling
Prevent this kind of exception to happen:
File "/odoo_src/saas-6/openerp/service/wsgi_server.py", line 123, in xmlrpc_handle_exception_string
fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
TypeError: cannot concatenate 'str' and 'NoneType' objects
| -rw-r--r-- | openerp/service/wsgi_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py index 377bca950a6..2a19641f090 100644 --- a/openerp/service/wsgi_server.py +++ b/openerp/service/wsgi_server.py @@ -120,7 +120,7 @@ def xmlrpc_handle_exception_int(e): def xmlrpc_handle_exception_string(e): if isinstance(e, openerp.exceptions.UserError): - fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '') + fault = xmlrpclib.Fault('warning -- %s\n\n%s' % (e.name, e.value), '') response = xmlrpclib.dumps(fault, allow_none=False, encoding=None) elif isinstance(e, openerp.exceptions.RedirectWarning): fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '') |