summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZara Gebru <zgebru@thoughtworks.com>2016-06-13 13:15:25 +0200
committerRuben Pollan <meskio@sindominio.net>2017-01-19 13:06:02 +0100
commit9932121dd3da2611f14a59b27c40042dadff80a3 (patch)
tree541749d33ae2ea3eb41cb89d3b6fb7a18a3a4a9b
parent8f992ee6e84d21c3e6306b27856e4ba90accc1f2 (diff)
rename some vars
-rw-r--r--src/leap/bitmask/keymanager/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py
index f0f8267..fb4668c 100644
--- a/src/leap/bitmask/keymanager/__init__.py
+++ b/src/leap/bitmask/keymanager/__init__.py
@@ -673,7 +673,7 @@ class KeyManager(object):
"""
Put raw key bound to address in local storage.
- :param key: The ascii key to be stored
+ :param key: The key to be stored
:type key: str
:param address: address for which this key will be active
:type address: str
@@ -727,10 +727,10 @@ class KeyManager(object):
"""
logger.info("fetch key for %s from %s" % (address, uri))
- ascii_content = yield self._get_with_combined_ca_bundle(uri)
+ key_content = yield self._get_with_combined_ca_bundle(uri)
# XXX parse binary keys
- pubkey, _ = self._openpgp.parse_key(ascii_content, address)
+ pubkey, _ = self._openpgp.parse_key(key_content, address)
if pubkey is None:
raise keymanager_errors.KeyNotFound(uri)