summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/bitmask_libraries/keymanager.py5
-rw-r--r--service/pixelated/resources/keys_resource.py2
-rw-r--r--service/pixelated/resources/user_settings_resource.py2
3 files changed, 4 insertions, 5 deletions
diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py
index 0ab91184..4cb3e80e 100644
--- a/service/pixelated/bitmask_libraries/keymanager.py
+++ b/service/pixelated/bitmask_libraries/keymanager.py
@@ -15,7 +15,6 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
from leap.keymanager import KeyManager, KeyNotFound
from pixelated.config import leap_config
-from .certs import LeapCertificate
from twisted.internet import defer
import logging
@@ -44,12 +43,12 @@ class Keymanager(object):
@defer.inlineCallbacks
def _key_exists(self, email):
try:
- yield self.fetch_key(email, private=True, fetch_remote=False)
+ yield self.get_key(email, private=True, fetch_remote=False)
defer.returnValue(True)
except KeyNotFound:
defer.returnValue(False)
- def fetch_key(self, email, private=False, fetch_remote=True):
+ def get_key(self, email, private=False, fetch_remote=True):
return self.keymanager.get_key(email, private=private, fetch_remote=fetch_remote)
def _gen_key(self):
diff --git a/service/pixelated/resources/keys_resource.py b/service/pixelated/resources/keys_resource.py
index 9075ab9e..e3d0733e 100644
--- a/service/pixelated/resources/keys_resource.py
+++ b/service/pixelated/resources/keys_resource.py
@@ -23,7 +23,7 @@ class KeysResource(BaseResource):
respond_json_deferred(None, request, status_code=404)
_, key_to_find = parseaddr(request.args.get('search')[0])
- d = _keymanager.fetch_key(key_to_find)
+ d = _keymanager.get_key(key_to_find)
d.addCallback(finish_request)
d.addErrback(key_not_found)
diff --git a/service/pixelated/resources/user_settings_resource.py b/service/pixelated/resources/user_settings_resource.py
index 38997b30..04b434bd 100644
--- a/service/pixelated/resources/user_settings_resource.py
+++ b/service/pixelated/resources/user_settings_resource.py
@@ -36,7 +36,7 @@ class UserSettingsResource(BaseResource):
def key_not_found(_):
respond_json_deferred({'account_email': _account_email, 'fingerprint': FINGERPRINT_NOT_FOUND}, request)
- d = self.keymanager(request).fetch_key(_account_email)
+ d = self.keymanager(request).get_key(_account_email)
d.addCallback(finish_request)
d.addErrback(key_not_found)