summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/l2db/remote/http_database.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-28 21:40:43 -0400
committerKali Kaneko <kali@leap.se>2016-07-12 03:09:24 +0200
commitb5aa97e9f88934dd73af84f212c95775f97769a9 (patch)
tree382b243aca84daf0d400a79cef95b84935632d7f /common/src/leap/soledad/common/l2db/remote/http_database.py
parent7abf86737562b5c79e902921df722f01e71178e6 (diff)
[refactor] make tests use l2db submodule
From this moment on, we embed a fork of u1db called l2db.
Diffstat (limited to 'common/src/leap/soledad/common/l2db/remote/http_database.py')
-rw-r--r--common/src/leap/soledad/common/l2db/remote/http_database.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/common/src/leap/soledad/common/l2db/remote/http_database.py b/common/src/leap/soledad/common/l2db/remote/http_database.py
index 400e4020..d8dcfd55 100644
--- a/common/src/leap/soledad/common/l2db/remote/http_database.py
+++ b/common/src/leap/soledad/common/l2db/remote/http_database.py
@@ -22,16 +22,14 @@ except ImportError:
import json # noqa
import uuid
-from u1db import (
+from leap.soledad.common.l2db import (
Database,
Document,
- errors,
- )
-from u1db.remote import (
+ errors)
+from leap.soledad.common.l2db.remote import (
http_client,
http_errors,
- http_target,
- )
+ http_target)
DOCUMENT_DELETED_STATUS = http_errors.wire_description_to_status[
@@ -152,8 +150,8 @@ class HTTPDatabase(http_client.HTTPClientBase, Database):
if doc.doc_id is None:
raise errors.InvalidDocId()
params = {'old_rev': doc.rev}
- res, headers = self._request_json('DELETE',
- ['doc', doc.doc_id], params)
+ res, headers = self._request_json(
+ 'DELETE', ['doc', doc.doc_id], params)
doc.make_tombstone()
doc.rev = res['rev']