Fix error handling for XML-RPC

issue2315 review191003 (transplanted from 96aa327a36574c3ec38733a748fba0cc62e50202)
2011-12-02 07:27:51 +01:00
parent 7d8f78af79
commit 6687b8f762
1 changed files with 7 additions and 4 deletions
@@ -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()):