From ec398af41c4d276abb02279efbcbb0aa08a4cbc8 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 13 Oct 2015 11:41:04 +0100
Subject: [PATCH] Expose error more nicely
---
synapse/app/homeserver.py | 5 ++---
synapse/storage/__init__.py | 3 ---
synapse/storage/engines/postgres.py | 2 +-
synapse/storage/engines/sqlite3.py | 2 +-
synapse/storage/{_schema_prepare.py => schema_prepare.py} | 0
tests/utils.py | 2 +-
6 files changed, 5 insertions(+), 9 deletions(-)
rename synapse/storage/{_schema_prepare.py => schema_prepare.py} (100%)
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 190b03e2f7..b284d07cf0 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -35,9 +35,8 @@ if __name__ == '__main__':
from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
-from synapse.storage import (
- are_all_users_on_domain, UpgradeDatabaseException,
-)
+from synapse.storage import are_all_users_on_domain
+from synapse.storage.schema_prepare import UpgradeDatabaseException
from synapse.server import HomeServer
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 4be629bff8..48a0633746 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -41,9 +41,6 @@ from .end_to_end_keys import EndToEndKeyStore
from .receipts import ReceiptsStore
-from ._schema_prepare import UpgradeDatabaseException
-
-__all__ = [UpgradeDatabaseException]
import logging
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py
index 949396044e..7e45dabf4c 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.schema_prepare import prepare_database
from ._base import IncorrectDatabaseSetup
diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py
index a66815ef2d..0eeaa45d19 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.schema_prepare import (
prepare_database, prepare_sqlite3_database
)
diff --git a/synapse/storage/_schema_prepare.py b/synapse/storage/schema_prepare.py
similarity index 100%
rename from synapse/storage/_schema_prepare.py
rename to synapse/storage/schema_prepare.py
diff --git a/tests/utils.py b/tests/utils.py
index dd19a16fc7..6eb575bd09 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 import prepare_database
+from synapse.storage.schema_prepare import prepare_database
from synapse.storage.engines import create_engine
from synapse.server import HomeServer
--
GitLab