@@ -0,0 +1,25 @@
|
||||
__author__ = 'RemiZOffAlex'
|
||||
__email__ = 'remizoffalex@mail.ru'
|
||||
|
||||
from .exceptions import *
|
||||
|
||||
|
||||
def Extract(handler)
|
||||
wrapper(query):
|
||||
params = None
|
||||
if 'params' in query:
|
||||
params = query['params']
|
||||
if params is None:
|
||||
response = handler()
|
||||
elif isinstance(params, list):
|
||||
response = handler(*params)
|
||||
elif isinstance(params, dict):
|
||||
response = handler(**params)
|
||||
else:
|
||||
response = InvalidParamsError(
|
||||
id=query['id'],
|
||||
message='Invalid params: {0}'.format(params)
|
||||
)
|
||||
|
||||
return response
|
||||
return wrapper
|
||||
+1
-19
@@ -94,24 +94,6 @@ class RPC:
|
||||
)
|
||||
return result
|
||||
|
||||
def __handle(self, handler, query):
|
||||
params = None
|
||||
if 'params' in query:
|
||||
params = query['params']
|
||||
if params is None:
|
||||
response = handler()
|
||||
elif isinstance(params, list):
|
||||
response = handler(*params)
|
||||
elif isinstance(params, dict):
|
||||
response = handler(**params)
|
||||
else:
|
||||
response = InvalidParamsError(
|
||||
id=query['id'],
|
||||
message='Invalid params: {0}'.format(params)
|
||||
)
|
||||
|
||||
return response
|
||||
|
||||
def __execute(self, query):
|
||||
"""Выполнение метода
|
||||
"""
|
||||
@@ -129,7 +111,7 @@ class RPC:
|
||||
handler = self.__handlers[name]
|
||||
|
||||
try:
|
||||
response = self.__handle(handler, query)
|
||||
response = handler(handler, query)
|
||||
except JSONRPCError as e:
|
||||
log.error(traceback.format_exc())
|
||||
response = InternalError(
|
||||
|
||||
Reference in New Issue
Block a user