diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
commit | f38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch) | |
tree | 08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /synapse/storage/engines | |
parent | Use more descriptive error code (diff) | |
parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
download | synapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/storage/engines')
-rw-r--r-- | synapse/storage/engines/postgres.py | 2 | ||||
-rw-r--r-- | synapse/storage/engines/sqlite3.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 4a855ffd56..98d66e0a86 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage import prepare_database +from synapse.storage.prepare_database import prepare_database from ._base import IncorrectDatabaseSetup diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py index d18e2808d1..bad3b5c5ac 100644 --- a/synapse/storage/engines/sqlite3.py +++ b/synapse/storage/engines/sqlite3.py @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage import prepare_database, prepare_sqlite3_database +from synapse.storage.prepare_database import ( + prepare_database, prepare_sqlite3_database +) class Sqlite3Engine(object): |