diff options
| author | kali <kali@leap.se> | 2012-12-27 03:09:34 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-12-27 03:09:34 +0900 |
| commit | 629b4ae10e17ab667a0b7ae9966914ea728da839 (patch) | |
| tree | ed8e5347e7c59362a10211dd006f355d4087c6f9 /backends | |
| parent | b958e3a1643de1e264deb2664a5b8835091f5821 (diff) | |
import fixes for soledad
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/__init__.py | 5 | ||||
| -rw-r--r-- | backends/couch.py | 5 | ||||
| -rw-r--r-- | backends/leap_backend.py (renamed from backends/leap.py) | 5 | ||||
| -rw-r--r-- | backends/objectstore.py | 7 |
4 files changed, 15 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..a3909596 100644 --- a/backends/couch.py +++ b/backends/couch.py @@ -2,8 +2,9 @@ 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..a8a65eb4 100644 --- a/backends/leap.py +++ b/backends/leap_backend.py @@ -6,8 +6,9 @@ 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 +import base64 # unused + +#from leap.soledad import util # import GPGWrapper # unused class NoDefaultKey(Exception): diff --git a/backends/objectstore.py b/backends/objectstore.py index 61445a1f..3cefdf5d 100644 --- a/backends/objectstore.py +++ b/backends/objectstore.py @@ -1,7 +1,8 @@ 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 +15,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() #------------------------------------------------------------------------- |