odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] ensure exception information is correctly converted to string before being concatenated with the faultCode string (sic) of emulated XMLRPC faults 

bzr revid: xmo@openerp.com-20120621102940-2lh6ho6v6d64h8hr
This commit is contained in:
Xavier Morel 2012-06-21 12:29:40 +02:00
parent ace69b6921 f294335d94
commit 7ee3c3f43d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/web/common/http.py
View File

@ -588,16 +588,17 @@ class LocalConnector(openerplib.Connector):
import openerp
import traceback
import xmlrpclib
code_string = "warning -- %s\n\n%s"
try:
result = openerp.netsvc.dispatch_rpc(service_name, method, args)
except Exception,e:
# TODO change the except to raise LibException instead of their emulated xmlrpc fault
if isinstance(e, openerp.osv.osv.except_osv):
fault = xmlrpclib.Fault('warning -- ' + e.name + '\n\n' + e.value, '')
fault = xmlrpclib.Fault(code_string % (e.name, e.value), '')
elif isinstance(e, openerp.exceptions.Warning):
fault = xmlrpclib.Fault('warning -- Warning\n\n' + str(e), '')
fault = xmlrpclib.Fault(code_string % ("Warning", e), '')
elif isinstance(e, openerp.exceptions.AccessError):
fault = xmlrpclib.Fault('warning -- AccessError\n\n' + str(e), '')
fault = xmlrpclib.Fault(code_string % ("AccessError", e), '')
elif isinstance(e, openerp.exceptions.AccessDenied):
fault = xmlrpclib.Fault('AccessDenied', str(e))
elif isinstance(e, openerp.exceptions.DeferredException):