From 6687b8f7622e4372cd96d4e81b92e31889ad5fde Mon Sep 17 00:00:00 2001 From: Korbinian Preisler Date: Fri, 2 Dec 2011 07:27:51 +0100 Subject: [PATCH] Fix error handling for XML-RPC issue2315 review191003 (transplanted from 96aa327a36574c3ec38733a748fba0cc62e50202) --- trytond/protocols/xmlrpc.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py index 91af6e282a..3e1154be16 100644 --- a/trytond/protocols/xmlrpc.py +++ b/trytond/protocols/xmlrpc.py @@ -90,10 +90,13 @@ class GenericXMLRPCRequestHandler: } return dispatch(host, port, 'XML-RPC', database_name, user, session, object_type, object_name, method, *params) - except (UserError, UserWarning, NotLogged, - ConcurrencyException), exception: - raise xmlrpclib.Fault(exception.code, - '\n'.join(exception.args)) + except (NotLogged, ConcurrencyException), exception: + raise xmlrpclib.Fault(exception.code, + '\n'.join(exception.args)) + except (UserError, UserWarning), exception: + error, description = exception.args + raise xmlrpclib.Fault(exception.code, + '\n'.join((error,) + description)) except Exception: tb_s = '' for line in traceback.format_exception(*sys.exc_info()):