diff options
| author | drebs <drebs@leap.se> | 2015-08-24 14:38:14 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-08-24 14:38:14 -0300 |
| commit | 6f3bbe60c5c8875698cc5424baf7aa26ae786770 (patch) | |
| tree | 30b44537f25405a0fd93021d0fbcd8558d02ab9d | |
| parent | 560c0a029f0f5cd2efc254786ca392f91dc80f19 (diff) | |
[refactor] remove simplejson dep on client
| -rw-r--r-- | client/pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/secrets.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index b676b67c..f29d5c74 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -1,5 +1,4 @@ pysqlcipher>2.6.3 -simplejson u1db scrypt pycryptopp diff --git a/client/src/leap/soledad/client/secrets.py b/client/src/leap/soledad/client/secrets.py index e55d64c6..ee3aacdb 100644 --- a/client/src/leap/soledad/client/secrets.py +++ b/client/src/leap/soledad/client/secrets.py @@ -26,11 +26,9 @@ import scrypt import logging import binascii import errno - +import json from hashlib import sha256 -import simplejson as json - from leap.soledad.common import soledad_assert from leap.soledad.common import soledad_assert_type |