From 83d5322706ec02bbc3d9e0677d8af4131aa76300 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 28 Jul 2016 11:17:29 -0300 Subject: [pkg] remove simplejson dep --- pkg/requirements.pip | 1 - src/leap/keymanager/keys.py | 5 +---- 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3