summaryrefslogtreecommitdiff
path: root/service/pixelated/resources/keys_resource.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-08-04 14:28:48 -0300
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-08-11 17:00:31 +0200
commit5862cb1db30fe4b748427cae663d4f3be3dd7af8 (patch)
tree51d8716052fc3b4227018b562b7d5c8c300624b9 /service/pixelated/resources/keys_resource.py
parenta7c84d6faf5ddd7866ce4c0508e03c7c3779eaca (diff)
[refactor] Extracts get_key logic, sharing it
This avoids direct access to keymanager and reuses logic from NickNym class. -- Issue #422
Diffstat (limited to 'service/pixelated/resources/keys_resource.py')
-rw-r--r--service/pixelated/resources/keys_resource.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/service/pixelated/resources/keys_resource.py b/service/pixelated/resources/keys_resource.py
index 8afb2bf6..6df95b28 100644
--- a/service/pixelated/resources/keys_resource.py
+++ b/service/pixelated/resources/keys_resource.py
@@ -1,7 +1,5 @@
from email.utils import parseaddr
-from leap.keymanager import OpenPGPKey
from pixelated.resources import respond_json_deferred
-from twisted.internet.threads import deferToThread
from twisted.web import server
from twisted.web.resource import Resource
@@ -25,7 +23,7 @@ class KeysResource(Resource):
respond_json_deferred(None, request, status_code=404)
_, key_to_find = parseaddr(request.args.get('search')[0])
- d = deferToThread(lambda: self._keymanager.get_key_from_cache(key_to_find, OpenPGPKey))
+ d = self._keymanager.fetch_key(key_to_find)
d.addCallback(finish_request)
d.addErrback(key_not_found)