From 869fcd2d8e43253e1e40432d0e55219daee1b58b Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 25 Nov 2012 20:42:48 +0100
Subject: [PATCH] jsonrpc: Move future handling code to its own method

---
 mopidy/utils/jsonrpc.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mopidy/utils/jsonrpc.py b/mopidy/utils/jsonrpc.py
index c280fc27..4287a94d 100644
--- a/mopidy/utils/jsonrpc.py
+++ b/mopidy/utils/jsonrpc.py
@@ -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):