summary refs log tree commit diff
path: root/synapse/storage/engines/sqlite3.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-14 11:40:45 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-14 11:40:45 +0100
commitf50c43464c953b523297f0ecc5acff2c425187eb (patch)
treebd9be856b0112260f3f59a204b530825c9f0458a /synapse/storage/engines/sqlite3.py
parentAdd a get_invites_for_user method to the storage to find out the rooms a user... (diff)
parentMerge pull request #303 from matrix-org/markjh/twisted_debugging (diff)
downloadsynapse-f50c43464c953b523297f0ecc5acff2c425187eb.tar.xz
Merge branch 'develop' into markjh/v2_sync_api
Diffstat (limited to 'synapse/storage/engines/sqlite3.py')
-rw-r--r--synapse/storage/engines/sqlite3.py4
1 files changed, 3 insertions, 1 deletions
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):