+4
-10
@@ -11,8 +11,6 @@ from .exceptions import *
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
||||
|
||||
class RPC:
|
||||
"""Основной класс RPC
|
||||
"""
|
||||
@@ -96,7 +94,7 @@ class RPC:
|
||||
)
|
||||
return result
|
||||
|
||||
def __handler_execute(self, handler, query):
|
||||
def __handle(self, handler, query):
|
||||
params = None
|
||||
if 'params' in query:
|
||||
params = query['params']
|
||||
@@ -107,14 +105,14 @@ class RPC:
|
||||
elif isinstance(params, dict):
|
||||
response = handler(**params)
|
||||
else:
|
||||
raise InvalidParamsError(
|
||||
response = InvalidParamsError(
|
||||
id=query['id'],
|
||||
message='Invalid params: {0}'.format(params)
|
||||
)
|
||||
|
||||
return response
|
||||
|
||||
def __handler_execute_save(self, query):
|
||||
def __execute(self, query):
|
||||
"""Выполнение метода
|
||||
"""
|
||||
result = self.validate(query)
|
||||
@@ -131,7 +129,7 @@ class RPC:
|
||||
handler = self.__handlers[name]
|
||||
|
||||
try:
|
||||
response = __handler_execute_save(handler, query)
|
||||
response = self.__handle(handler, query)
|
||||
except JSONRPCError as e:
|
||||
log.error(traceback.format_exc())
|
||||
response = InternalError(
|
||||
@@ -168,10 +166,6 @@ class RPC:
|
||||
result.append(response)
|
||||
return result
|
||||
|
||||
def __getattr__(self, key):
|
||||
if key == 'handlers':
|
||||
return self.__handlers
|
||||
|
||||
def __getitem__(self, key):
|
||||
handler = self.__handlers[key]
|
||||
return handler
|
||||
|
||||
Reference in New Issue
Block a user