Bitmessage/PyBitmessage-2024-12-01
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Proper message for APIError 0

Browse Source
This commit is contained in:
Dmitri Bogomolov 2018-10-24 17:33:05 +03:00
parent 7cafe402be
commit 5925781b9a
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api.py
View File

@ -1188,9 +1188,27 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler, object):
try:
# pylint: disable=attribute-defined-outside-init
self._method = method
return self._handlers[method](self, *params)
func = self._handlers[method]
return func(self, *params)
except KeyError:
raise APIError(20, 'Invalid method: %s' % method)
except TypeError as e:
msg = "Unexpected internal error: %s" % e
if 'argument' not in str(e):
raise APIError(0, msg)
argcount = len(params)
maxcount = func.func_code.co_argcount
if argcount > maxcount:
msg = (
"Command %s takes at most %s parameters (%s given)" %
(method, maxcount, argcount))
else:
mincount = maxcount - len(func.func_defaults or [])
if argcount < mincount:
msg = (
"Command %s takes at least %s parameters (%s given)" %
(method, mincount, argcount))
raise APIError(0, msg)
finally:
state.last_api_response = time.time()