andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jsonrpc: Move future handling code to its own method

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-25 20:42:48 +01:00
parent 7f987cb1e2
commit 869fcd2d8e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/utils/jsonrpc.py
View File

@ -126,8 +126,7 @@ class JsonRpcWrapper(object):
if self._is_notification(request):
return None
if self._is_future(result):
result = result.get()
result = self._unwrap_result(result)
return {
'jsonrpc': '2.0',
@ -201,8 +200,10 @@ class JsonRpcWrapper(object):
def _is_notification(self, request):
return 'id' not in request
def _is_future(self, result):
return isinstance(result, pykka.Future)
def _unwrap_result(self, result):
if isinstance(result, pykka.Future):
result = result.get()
return result
class JsonRpcError(Exception):