summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/pix.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2016-05-03 11:56:08 -0300
committerRuben Pollan <meskio@sindominio.net>2016-05-24 20:09:57 +0200
commitc416fd56ebba9924c1bb0caa60da667204c701e3 (patch)
tree9f25ce9cf0cb944a1d10fe9a838d01652a396979 /src/leap/bitmask/pix.py
parent7ba3e07b4659de38a189798540fe5e80b66b10d0 (diff)
[feat] Adapt to the new KeyManager API without key types
- Related: #8031
Diffstat (limited to 'src/leap/bitmask/pix.py')
-rw-r--r--src/leap/bitmask/pix.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/leap/bitmask/pix.py b/src/leap/bitmask/pix.py
index b510106d..d58944cf 100644
--- a/src/leap/bitmask/pix.py
+++ b/src/leap/bitmask/pix.py
@@ -26,7 +26,7 @@ from twisted.python import log
from leap.bitmask.util import get_path_prefix
from leap.mail.mail import Account
-from leap.keymanager import openpgp, KeyNotFound
+from leap.keymanager import KeyNotFound
try:
from pixelated.adapter.mailstore import LeapMailStore
@@ -114,14 +114,13 @@ class NickNym(object):
def fetch_key(self, email, private=False, fetch_remote=True):
return self.keymanager.get_key(
- email, openpgp.OpenPGPKey,
- private=private, fetch_remote=fetch_remote)
+ email, private=private, fetch_remote=fetch_remote)
def _gen_key(self):
- return self.keymanager.gen_key(openpgp.OpenPGPKey)
+ return self.keymanager.gen_key()
def _send_key_to_leap(self):
- return self.keymanager.send_key(openpgp.OpenPGPKey)
+ return self.keymanager.send_key()
class LeapSessionAdapter(object):