diff options
| author | drebs <drebs@leap.se> | 2013-01-22 10:09:43 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-22 10:09:43 -0200 |
| commit | 3bf11c9109a457ddbeb47524e34a5c1fd97bd27c (patch) | |
| tree | cae77f65c1b4377d4fd6934139c0074a92d3f121 /tests/test_encrypted.py | |
| parent | 629b4ae10e17ab667a0b7ae9966914ea728da839 (diff) | |
| parent | 9a487e87aceddbf656f14961356c74cb7a1de146 (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/__init__.py
src/leap/soledad/backends/couch.py
src/leap/soledad/backends/leap_backend.py
src/leap/soledad/backends/objectstore.py
src/leap/soledad/tests/test_couch.py
src/leap/soledad/tests/test_logs.py
src/leap/soledad/tests/test_sqlcipher.py
src/leap/soledad/util.py
Diffstat (limited to 'tests/test_encrypted.py')
| -rw-r--r-- | tests/test_encrypted.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/test_encrypted.py b/tests/test_encrypted.py index 4ee03a3c..8cb6dc51 100644 --- a/tests/test_encrypted.py +++ b/tests/test_encrypted.py @@ -1,8 +1,3 @@ -try: - import simplejson as json -except ImportError: - import json # noqa - import unittest2 as unittest import os |