summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/tests/test_keymanager.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@futeisha.org>2013-10-02 10:29:07 -0400
committerKali Kaneko <kali@futeisha.org>2013-10-02 10:29:07 -0400
commit046acc7ae9e866baba9cab151bf2694fab10b43c (patch)
tree6b2ffe35ebe177a04eb4ea8fc32e8049ebb1e91b /src/leap/keymanager/tests/test_keymanager.py
parentb83926f60ae8bd94e7b63f66c506d1044b94c0b1 (diff)
parentb1024172ed1ab137a2bd6efb687397fe9f56644a (diff)
Merge remote-tracking branch 'drebs/feature/2342-use-new-gnupg-module-2' into develop
Diffstat (limited to 'src/leap/keymanager/tests/test_keymanager.py')
-rw-r--r--src/leap/keymanager/tests/test_keymanager.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py
index 5f232fed..25126047 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/src/leap/keymanager/tests/test_keymanager.py
@@ -28,7 +28,6 @@ from leap.keymanager import (
KeyManager,
openpgp,
KeyNotFound,
- NoPasswordGiven,
errors,
)
from leap.keymanager.openpgp import OpenPGPKey