summaryrefslogtreecommitdiff
path: root/src/leap/soledad/server.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-05-25 10:39:32 -0300
committerdrebs <drebs@leap.se>2013-05-25 11:20:21 -0300
commit6be80318adc9f1323b0b83651107810ac481511e (patch)
tree5daf12e2e794e9bd997db71e8138a3ed83c25978 /src/leap/soledad/server.py
parentfdb52571378d1e6d522a74ad29833114a7eccd2e (diff)
Enforce dependency on simplejson.
Diffstat (limited to 'src/leap/soledad/server.py')
-rw-r--r--src/leap/soledad/server.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/leap/soledad/server.py b/src/leap/soledad/server.py
index 5a2bb81f..9c9e0ad7 100644
--- a/src/leap/soledad/server.py
+++ b/src/leap/soledad/server.py
@@ -25,10 +25,7 @@ This should be run with:
import configparser
import httplib
-try:
- import simplejson as json
-except ImportError:
- import json # noqa
+import simplejson as json
from hashlib import sha256