summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--soledad/src/leap/soledad/auth.py3
-rw-r--r--soledad/src/leap/soledad/tests/test_server.py6
-rw-r--r--soledad_server/src/leap/soledad_server/__init__.py2
3 files changed, 1 insertions, 10 deletions
diff --git a/soledad/src/leap/soledad/auth.py b/soledad/src/leap/soledad/auth.py
index 8c093099..81e838d2 100644
--- a/soledad/src/leap/soledad/auth.py
+++ b/soledad/src/leap/soledad/auth.py
@@ -24,7 +24,6 @@ they can do token-based auth requests to the Soledad server.
"""
-from u1db.remote.http_client import HTTPClientBase
from u1db import errors
@@ -68,4 +67,4 @@ class TokenBasedAuth(object):
return [('Authorization', 'Token %s' % auth.encode('base64')[:-1])]
else:
raise errors.UnknownAuthMethod(
- 'Wrong credentials: %s' % self._creds)
+ 'Wrong credentials: %s' % self._creds) \ No newline at end of file
diff --git a/soledad/src/leap/soledad/tests/test_server.py b/soledad/src/leap/soledad/tests/test_server.py
index 490d2fc8..ba01a391 100644
--- a/soledad/src/leap/soledad/tests/test_server.py
+++ b/soledad/src/leap/soledad/tests/test_server.py
@@ -21,17 +21,13 @@ Tests for server-related functionality.
"""
import os
-import shutil
import tempfile
import simplejson as json
-import hashlib
import mock
from leap.soledad import Soledad
from leap.soledad_server import (
- SoledadApp,
- SoledadAuthMiddleware,
URLToAuth,
)
from leap.soledad_server.couch import (
@@ -42,11 +38,9 @@ from leap.soledad import target
from leap.common.testing.basetest import BaseLeapTest
-from leap.soledad.tests import ADDRESS
from leap.soledad.tests.u1db_tests import (
TestCaseWithServer,
simple_doc,
- nested_doc,
)
from leap.soledad.tests.test_couch import CouchDBTestCase
from leap.soledad.tests.test_target import (
diff --git a/soledad_server/src/leap/soledad_server/__init__.py b/soledad_server/src/leap/soledad_server/__init__.py
index bea5d5fd..471ac30f 100644
--- a/soledad_server/src/leap/soledad_server/__init__.py
+++ b/soledad_server/src/leap/soledad_server/__init__.py
@@ -28,7 +28,6 @@ import httplib
import simplejson as json
-from hashlib import sha256
from routes.mapper import Mapper
from u1db import DBNAME_CONSTRAINTS
from u1db.remote import http_app
@@ -52,7 +51,6 @@ if version.base() == "12.0.0":
from couchdb.client import Server
-from leap.soledad import SECRETS_DOC_ID_HASH_PREFIX
from leap.soledad_server.couch import CouchServerState