diff options
| author | drebs <drebs@leap.se> | 2016-07-28 11:17:29 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-07-28 11:51:55 -0300 |
| commit | 83d5322706ec02bbc3d9e0677d8af4131aa76300 (patch) | |
| tree | 0874da4dc7993c731fb5effd7c7cdb73f129becc | |
| parent | e93e4775dba2962188baf8110704f5a7e092f827 (diff) | |
[pkg] remove simplejson dep
| -rw-r--r-- | pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | src/leap/keymanager/keys.py | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 7099304..386b85c 100644 --- a/pkg/requirements.pip +++ b/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/src/leap/keymanager/keys.py b/src/leap/keymanager/keys.py index c0ee21b..91ecf3a 100644 --- a/src/leap/keymanager/keys.py +++ b/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 |