diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-27 12:44:15 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-27 12:44:15 -0300 |
| commit | aa05d0c2076984ffe7e9b1f3ee84b7b1c0dea6b8 (patch) | |
| tree | 11931448cecb041f4adaea3b8161b479e135f206 /src/leap/soledad/shared_db.py | |
| parent | 8cef16cd458801b1513bbcd6849edc4599204b6f (diff) | |
| parent | 6238f80b9d9c8ea7091e196ccb69371050fd45db (diff) | |
Merge remote-tracking branch 'drebs/feature/2356-prevent-some-db-actions-in-server' into develop
Diffstat (limited to 'src/leap/soledad/shared_db.py')
| -rw-r--r-- | src/leap/soledad/shared_db.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/leap/soledad/shared_db.py b/src/leap/soledad/shared_db.py index c954dbea..33c5c484 100644 --- a/src/leap/soledad/shared_db.py +++ b/src/leap/soledad/shared_db.py @@ -20,10 +20,7 @@ A shared database for storing/retrieving encrypted key material. """ -try: - import simplejson as json -except ImportError: - import json # noqa +import simplejson as json from u1db.remote import http_database |