From 6be80318adc9f1323b0b83651107810ac481511e Mon Sep 17 00:00:00 2001 From: drebs Date: Sat, 25 May 2013 10:39:32 -0300 Subject: Enforce dependency on simplejson. --- src/leap/soledad/backends/couch.py | 5 +---- src/leap/soledad/backends/leap_backend.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/leap/soledad/backends') diff --git a/src/leap/soledad/backends/couch.py b/src/leap/soledad/backends/couch.py index 93279e2e..0b9bff01 100644 --- a/src/leap/soledad/backends/couch.py +++ b/src/leap/soledad/backends/couch.py @@ -21,10 +21,7 @@ # general imports import uuid import re -try: - import simplejson as json -except ImportError: - import json # noqa +import simplejson as json from base64 import b64encode, b64decode diff --git a/src/leap/soledad/backends/leap_backend.py b/src/leap/soledad/backends/leap_backend.py index bb8ee548..4af2489b 100644 --- a/src/leap/soledad/backends/leap_backend.py +++ b/src/leap/soledad/backends/leap_backend.py @@ -21,10 +21,7 @@ A U1DB backend for encrypting data before sending to server and decrypting after receiving. """ -try: - import simplejson as json -except ImportError: - import json # noqa +import simplejson as json import hashlib import hmac import binascii -- cgit v1.2.3