summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:56:22 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 13:56:22 +0100
commit17c80c8a3d92acca5bda9b0fc7d9898547476563 (patch)
tree04a46e242026f2e6b4379b13e3332b9b61cf80ed
parentExpose error more nicely (diff)
downloadsynapse-17c80c8a3d92acca5bda9b0fc7d9898547476563.tar.xz
rename schema_prepare to prepare_database
-rwxr-xr-xsynapse/app/homeserver.py2
-rw-r--r--synapse/storage/engines/postgres.py2
-rw-r--r--synapse/storage/engines/sqlite3.py2
-rw-r--r--synapse/storage/prepare_database.py (renamed from synapse/storage/schema_prepare.py)0
-rw-r--r--tests/utils.py2
5 files changed, 4 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index b284d07cf0..af53acb369 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py
@@ -36,7 +36,7 @@ if __name__ == '__main__': from synapse.storage.engines import create_engine, IncorrectDatabaseSetup from synapse.storage import are_all_users_on_domain -from synapse.storage.schema_prepare import UpgradeDatabaseException +from synapse.storage.prepare_database import UpgradeDatabaseException from synapse.server import HomeServer diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py
index 7e45dabf4c..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.schema_prepare 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 0eeaa45d19..bad3b5c5ac 100644 --- a/synapse/storage/engines/sqlite3.py +++ b/synapse/storage/engines/sqlite3.py
@@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.storage.schema_prepare import ( +from synapse.storage.prepare_database import ( prepare_database, prepare_sqlite3_database ) diff --git a/synapse/storage/schema_prepare.py b/synapse/storage/prepare_database.py
index 1ddf55be4d..1ddf55be4d 100644 --- a/synapse/storage/schema_prepare.py +++ b/synapse/storage/prepare_database.py
diff --git a/tests/utils.py b/tests/utils.py
index 6eb575bd09..4da51291a4 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -16,7 +16,7 @@ from synapse.http.server import HttpServer from synapse.api.errors import cs_error, CodeMessageException, StoreError from synapse.api.constants import EventTypes -from synapse.storage.schema_prepare import prepare_database +from synapse.storage.prepare_database import prepare_database from synapse.storage.engines import create_engine from synapse.server import HomeServer