summaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2012-12-27 11:09:39 -0200
committerdrebs <drebs@leap.se>2012-12-27 11:09:39 -0200
commit3bc6ab2d5ac65c1919e8e6ff627894924e4f98a9 (patch)
treecaae25cb8f93f2a4c8e7803e63685cf7486006b5 /backends
parent408436837d5768444566f69205127a815bca699b (diff)
Fix imports and namespaces
Diffstat (limited to 'backends')
-rw-r--r--backends/__init__.py5
-rw-r--r--backends/couch.py4
-rw-r--r--backends/leap_backend.py (renamed from backends/leap.py)3
-rw-r--r--backends/objectstore.py6
4 files changed, 11 insertions, 7 deletions
diff --git a/backends/__init__.py b/backends/__init__.py
index e69de29b..72907f37 100644
--- a/backends/__init__.py
+++ b/backends/__init__.py
@@ -0,0 +1,5 @@
+import objectstore
+
+
+__all__ = [
+ 'objectstore']
diff --git a/backends/couch.py b/backends/couch.py
index ed356fdd..101dd4ea 100644
--- a/backends/couch.py
+++ b/backends/couch.py
@@ -2,8 +2,8 @@ from u1db import errors
from u1db.remote.http_target import HTTPSyncTarget
from couchdb.client import Server, Document
from couchdb.http import ResourceNotFound
-from soledad.backends.objectstore import ObjectStore
-from soledad.backends.leap import LeapDocument
+from leap.soledad.backends.objectstore import ObjectStore
+from leap.soledad.backends.leap_backend import LeapDocument
try:
import simplejson as json
diff --git a/backends/leap.py b/backends/leap_backend.py
index 9fbd49fe..ced8734c 100644
--- a/backends/leap.py
+++ b/backends/leap_backend.py
@@ -6,8 +6,7 @@ except ImportError:
from u1db import Document
from u1db.remote.http_target import HTTPSyncTarget
from u1db.remote.http_database import HTTPDatabase
-import base64
-from soledad.util import GPGWrapper
+from leap.soledad.util import GPGWrapper
class NoDefaultKey(Exception):
diff --git a/backends/objectstore.py b/backends/objectstore.py
index 61445a1f..9fce88f6 100644
--- a/backends/objectstore.py
+++ b/backends/objectstore.py
@@ -1,7 +1,7 @@
import uuid
from u1db.backends import CommonBackend
from u1db import errors, Document
-from soledad.util import SyncLog, TransactionLog
+from leap.soledad import util as soledadutil
class ObjectStore(CommonBackend):
@@ -14,8 +14,8 @@ class ObjectStore(CommonBackend):
# with the database is established, so it can ensure that u1db data is
# configured and up-to-date.
self.set_document_factory(Document)
- self._sync_log = SyncLog()
- self._transaction_log = TransactionLog()
+ self._sync_log = soledadutil.SyncLog()
+ self._transaction_log = soledadutil.TransactionLog()
self._ensure_u1db_data()
#-------------------------------------------------------------------------