summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-05-08 05:56:20 -0300
committerVictor Shyba <victor1984@riseup.net>2017-05-08 05:56:20 -0300
commit3ff522b687dcccd1ada5da5aba526057befec007 (patch)
tree4f3c9e2d2f4744cfeed4e82d780577bac79e4293 /common/src/leap/soledad
parentac0e01ccf4a7d372cddea03ae1982a01e28b9cd0 (diff)
[refactor] _database -> _db
Diffstat (limited to 'common/src/leap/soledad')
-rw-r--r--common/src/leap/soledad/common/l2db/__init__.py2
-rw-r--r--common/src/leap/soledad/common/l2db/remote/server_state.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/common/src/leap/soledad/common/l2db/__init__.py b/common/src/leap/soledad/common/l2db/__init__.py
index ebbf546a..43d61b1d 100644
--- a/common/src/leap/soledad/common/l2db/__init__.py
+++ b/common/src/leap/soledad/common/l2db/__init__.py
@@ -37,7 +37,7 @@ def open(path, create, document_factory=None):
parameters as Document.__init__.
:return: An instance of Database.
"""
- from leap.soledad.client._database import sqlite
+ from leap.soledad.client._db import sqlite
return sqlite.SQLiteDatabase.open_database(
path, create=create, document_factory=document_factory)
diff --git a/common/src/leap/soledad/common/l2db/remote/server_state.py b/common/src/leap/soledad/common/l2db/remote/server_state.py
index 89ac5742..d4c3c45f 100644
--- a/common/src/leap/soledad/common/l2db/remote/server_state.py
+++ b/common/src/leap/soledad/common/l2db/remote/server_state.py
@@ -42,7 +42,7 @@ class ServerState(object):
def open_database(self, path):
"""Open a database at the given location."""
- from leap.soledad.client._database import sqlite
+ from leap.soledad.client._db import sqlite
full_path = self._relpath(path)
return sqlite.SQLiteDatabase.open_database(full_path, create=False)
@@ -56,13 +56,13 @@ class ServerState(object):
def ensure_database(self, path):
"""Ensure database at the given location."""
- from leap.soledad.client._database import sqlite
+ from leap.soledad.client._db import sqlite
full_path = self._relpath(path)
db = sqlite.SQLiteDatabase.open_database(full_path, create=True)
return db, db._replica_uid
def delete_database(self, path):
"""Delete database at the given location."""
- from leap.soledad.client._database import sqlite
+ from leap.soledad.client._db import sqlite
full_path = self._relpath(path)
sqlite.SQLiteDatabase.delete_database(full_path)