Commit 52e4303c authored by Kali Kaneko's avatar Kali Kaneko

Merge branch 'develop' into release/0.5.1

parents e2049062 0aecef29
include pkg/*
include LICENSE
include CHANGELOG.rst
include src/leap/keymanager/
- encryption keys can now be serialized to json using key.get_dict()
......@@ -192,6 +192,11 @@ class EncryptionKey(object):
__metaclass__ = ABCMeta
__slots__ = ('address', 'uids', 'fingerprint', 'key_data',
'private', 'length', 'expiry_date', 'validation',
'last_audited_at', 'refreshed_at',
'encr_used', 'sign_used', '_index')
def __init__(self, address=None, uids=[], fingerprint="",
key_data="", private=False, length=0, expiry_date=None,
validation=ValidationLevels.Weak_Chain, last_audited_at=None,
......@@ -212,6 +217,7 @@ class EncryptionKey(object):
self.refreshed_at = refreshed_at
self.encr_used = encr_used
self.sign_used = sign_used
self._index = len(self.__slots__)
def get_json(self):
......@@ -258,6 +264,27 @@ class EncryptionKey(object):
def next(self):
if self._index == 0:
self._index = len(self.__slots__)
raise StopIteration
self._index -= 1
key = self.__slots__[self._index]
if key.startswith('_'):
value = getattr(self, key)
if key == "validation":
value = str(value)
elif key in ["expiry_date", "last_audited_at", "refreshed_at"]:
value = str(value)
return key, value
def __iter__(self):
return self
def __repr__(self):
Representation of this class
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment