summaryrefslogtreecommitdiff
path: root/keymanager
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-19 14:42:11 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-19 14:42:11 -0300
commitbd5e5ea19b1cb16cbd3441bf17cee1e7842d8212 (patch)
treec5593daa3ff06de00f12fa9034cce3ce8aed8bb2 /keymanager
parent183253c9a9d2e2cae8467c1c4115d129e9a49d65 (diff)
parent6559c38b51c28245cdbb06641466defac607855b (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/fix-memoized--get-key' into develop
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/src/leap/keymanager/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/keymanager/src/leap/keymanager/__init__.py b/keymanager/src/leap/keymanager/__init__.py
index 5b1d8d9..aa4e2e7 100644
--- a/keymanager/src/leap/keymanager/__init__.py
+++ b/keymanager/src/leap/keymanager/__init__.py
@@ -252,6 +252,12 @@ class KeyManager(object):
signal(proto.KEYMANAGER_DONE_UPLOADING_KEYS, self._address)
@memoized_method
+ def get_key_from_cache(self, *args, **kwargs):
+ """
+ Public interface to `get_key`, that is memoized.
+ """
+ return self.get_key(*args, **kwargs)
+
def get_key(self, address, ktype, private=False, fetch_remote=True):
"""
Return a key of type C{ktype} bound to C{address}.