summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/tests
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 11:23:26 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 11:23:26 -0300
commit4f8408f54ee5dff6706cee6c052beb1c81c51dd7 (patch)
tree8ce8deb3a7186bbb74fdea1a1e3c3b8677edc9e4 /src/leap/keymanager/tests
parent54a105c53333a96c2649185823a8473a51f93479 (diff)
parentdad5faffd96699e7a883299b9ea098e6694ca5ea (diff)
Merge branch 'release-0.3.3'0.3.3
Diffstat (limited to 'src/leap/keymanager/tests')
-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