summaryrefslogtreecommitdiff
path: root/keymanager
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-07-28 11:17:29 -0300
committerdrebs <drebs@leap.se>2016-07-28 11:51:55 -0300
commit47b57872c2ccd94f6f4900a3bd1e7a3dab9a933a (patch)
tree8ca4ffdfeb995bcdbee1a59ba07b16834d50c238 /keymanager
parent33b7af9d32802ba12bde5da315a09e7615ffdf8f (diff)
[pkg] remove simplejson dep
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/pkg/requirements.pip1
-rw-r--r--keymanager/src/leap/keymanager/keys.py5
2 files changed, 1 insertions, 5 deletions
diff --git a/keymanager/pkg/requirements.pip b/keymanager/pkg/requirements.pip
index 70993048..386b85c6 100644
--- a/keymanager/pkg/requirements.pip
+++ b/keymanager/pkg/requirements.pip
@@ -1,4 +1,3 @@
# if we bump the gnupg version, bump also the sanity check
# in keymanager.__init__
gnupg>=1.4.0
-simplejson
diff --git a/keymanager/src/leap/keymanager/keys.py b/keymanager/src/leap/keymanager/keys.py
index c0ee21b1..91ecf3ac 100644
--- a/keymanager/src/leap/keymanager/keys.py
+++ b/keymanager/src/leap/keymanager/keys.py
@@ -19,10 +19,7 @@ Abstact key type and encryption scheme representations.
"""
-try:
- import simplejson as json
-except ImportError:
- import json # noqa
+import json
import logging
import re
import time