summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-08-24 14:38:46 -0300
committerdrebs <drebs@leap.se>2015-08-24 14:38:46 -0300
commit66b58d3222e86916431f5c9cd534619537de5359 (patch)
tree1809fa495a17a6ab999294613418c054bbe2608e /server
parent6f3bbe60c5c8875698cc5424baf7aa26ae786770 (diff)
[refactor] remove simplejson dep on server
Diffstat (limited to 'server')
-rw-r--r--server/pkg/requirements.pip1
-rw-r--r--server/src/leap/soledad/server/auth.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index 53f7db57..d75678b2 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -1,6 +1,5 @@
configparser
couchdb
-simplejson
u1db
routes
PyOpenSSL
diff --git a/server/src/leap/soledad/server/auth.py b/server/src/leap/soledad/server/auth.py
index 425758f5..02b54cca 100644
--- a/server/src/leap/soledad/server/auth.py
+++ b/server/src/leap/soledad/server/auth.py
@@ -23,7 +23,7 @@ Authentication facilities for Soledad Server.
import time
import httplib
-import simplejson as json
+import json
from u1db import DBNAME_CONSTRAINTS, errors as u1db_errors
from abc import ABCMeta, abstractmethod