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