diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-14 11:40:45 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-14 11:40:45 +0100 |
| commit | f50c43464c953b523297f0ecc5acff2c425187eb (patch) | |
| tree | bd9be856b0112260f3f59a204b530825c9f0458a /synapse/storage/engines | |
| parent | Add a get_invites_for_user method to the storage to find out the rooms a user... (diff) | |
| parent | Merge pull request #303 from matrix-org/markjh/twisted_debugging (diff) | |
| download | synapse-f50c43464c953b523297f0ecc5acff2c425187eb.tar.xz | |
Merge branch 'develop' into markjh/v2_sync_api
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): |