diff options
author | Zara Gebru <zgebru@thoughtworks.com> | 2016-11-18 16:51:27 +0100 |
---|---|---|
committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-11-22 15:57:05 +0100 |
commit | 1baa817b567cc234e76faafc5ec92cfa75222ba6 (patch) | |
tree | 156204c635077f27f6c0f124f731c6b2347f961a /src/leap/bitmask/keymanager/openpgp.py | |
parent | 0871c96aa71d9b9112a90ab7cc6d4adfc3cd7fa4 (diff) |
[tests] fix keymanager tests after refactor and merge
- some pep8 problems
- some confusion with old and new code after merging
from old keymanager
Diffstat (limited to 'src/leap/bitmask/keymanager/openpgp.py')
-rw-r--r-- | src/leap/bitmask/keymanager/openpgp.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/bitmask/keymanager/openpgp.py b/src/leap/bitmask/keymanager/openpgp.py index b256ff00..b72c62ce 100644 --- a/src/leap/bitmask/keymanager/openpgp.py +++ b/src/leap/bitmask/keymanager/openpgp.py @@ -533,12 +533,13 @@ class OpenPGPScheme(object): d.addCallback(delete_key) return d + @defer.inlineCallbacks def unactivate_key(self, address): """ Mark a active doc as deleted. :param address: The unique address for the active content. """ - active_doc = self._get_active_doc_from_address(address, False) + active_doc = yield self._get_active_doc_from_address(address, False) yield self._soledad.delete_doc(active_doc) # |