From 3ff522b687dcccd1ada5da5aba526057befec007 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 8 May 2017 05:56:20 -0300 Subject: [refactor] _database -> _db --- common/src/leap/soledad/common/l2db/__init__.py | 2 +- common/src/leap/soledad/common/l2db/remote/server_state.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'common/src/leap') 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) -- cgit v1.2.3