summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/l2db/sync.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/sync.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/sync.py')
-rw-r--r--common/src/leap/soledad/common/l2db/sync.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/common/src/leap/soledad/common/l2db/sync.py b/common/src/leap/soledad/common/l2db/sync.py
index d9e455d8..26e67140 100644
--- a/common/src/leap/soledad/common/l2db/sync.py
+++ b/common/src/leap/soledad/common/l2db/sync.py
@@ -17,8 +17,8 @@
"""The synchronization utilities for U1DB."""
from itertools import izip
-import u1db
-from u1db import errors
+from leap.soledad.common import l2db
+from leap.soledad.common.l2db import errors
class Synchronizer(object):
@@ -275,11 +275,10 @@ class SyncExchange(object):
# for tests
self._db._last_exchange_log['return'] = {
'docs': _outgoing_trace,
- 'last_gen': self.new_gen
- }
+ 'last_gen': self.new_gen}
-class LocalSyncTarget(u1db.SyncTarget):
+class LocalSyncTarget(l2db.SyncTarget):
"""Common sync target implementation logic for all local sync targets."""
def __init__(self, db):