Merge pull request #38 from gisce/improve_xmlrpc_fault_handle

Handle Int faultCodes
gisce · Feb 7, 2020 · a97bd21 · a97bd21
2 parents 7d8f102 + bb8891f
commit a97bd21
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bin/rpc.py b/bin/rpc.py
@@ -241,6 +241,10 @@ def rpc_exec_auth(self, obj, method, *args):
             except Exception, e:
                 if isinstance(e, (xmlrpclib.Fault, tiny_socket.Myexception)):
                     a = rpc_exception(e.faultCode, e.faultString)
+                    if isinstance(e.faultCode, int):
+                        a.type = 'UserError'
+                        a.message = 'Error %s' % e.faultCode
+                        a.data = e.faultString
                     if a.type in ('warning','UserError'):
                         if a.message in ('ConcurrencyException') and len(args) > 4:
                             if common.concurrency(args[0], args[2][0], args[4]):