summaryrefslogtreecommitdiff
path: root/src/leap/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
commit2631d418233e31dd9dfd4d97734372cb67d09951 (patch)
tree41a99e2d7133deef5a2fd58ab4b06a95d0280fb8 /src/leap/keymanager
parentf703b0d41889c0c5827efd084609ea585ef19055 (diff)
parentbdb605a56935935bfdd5c058e7564a6a2be2829f (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/fix-memoized--get-key' into develop
Diffstat (limited to 'src/leap/keymanager')
-rw-r--r--src/leap/keymanager/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index 5b1d8d96..aa4e2e72 100644
--- a/src/leap/keymanager/__init__.py
+++ b/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}.