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/tests/test_crypto.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/tests/test_crypto.py')
| -rw-r--r-- | src/leap/soledad/tests/test_crypto.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py index d35fc1c1..5432856e 100644 --- a/src/leap/soledad/tests/test_crypto.py +++ b/src/leap/soledad/tests/test_crypto.py @@ -23,10 +23,7 @@ Tests for cryptographic related stuff. import os import shutil import tempfile -try: - import simplejson as json -except ImportError: - import json # noqa +import simplejson as json import hashlib @@ -44,7 +41,7 @@ from leap.soledad.backends.leap_backend import ( WrongMac, ) from leap.soledad.backends.couch import CouchDatabase -from leap.soledad import KeyAlreadyExists, Soledad +from leap.soledad import Soledad from leap.soledad.crypto import SoledadCrypto from leap.soledad.tests import BaseSoledadTest from leap.soledad.tests.test_couch import CouchDBTestCase |