diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-08 16:53:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-08 16:53:48 +0100 |
| commit | 279a547a8b7f7e9b9e8f4ed1ae25686824198107 (patch) | |
| tree | 7029d05b614039823b5251863c0d132923b86cd5 | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into mysql (diff) | |
| download | synapse-279a547a8b7f7e9b9e8f4ed1ae25686824198107.tar.xz | |
Use generic db exceptions rather than sqlite3 specific ones
| -rw-r--r-- | synapse/storage/directory.py | 4 | ||||
| -rw-r--r-- | synapse/storage/registration.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py index cfb2005706..2b2bdf8615 100644 --- a/synapse/storage/directory.py +++ b/synapse/storage/directory.py @@ -21,8 +21,6 @@ from twisted.internet import defer from collections import namedtuple -import sqlite3 - RoomAliasMapping = namedtuple( "RoomAliasMapping", @@ -91,7 +89,7 @@ class DirectoryStore(SQLBaseStore): }, desc="create_room_alias_association", ) - except sqlite3.IntegrityError: + except self.database_engine.module.IntegrityError: raise SynapseError( 409, "Room alias %s already exists" % room_alias.to_string() ) diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 0f9d898e5d..f7d8291281 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -15,8 +15,6 @@ from twisted.internet import defer -from sqlite3 import IntegrityError - from synapse.api.errors import StoreError, Codes from ._base import SQLBaseStore, cached @@ -76,7 +74,7 @@ class RegistrationStore(SQLBaseStore): txn.execute("INSERT INTO users(name, password_hash, creation_ts) " "VALUES (?,?,?)", [user_id, password_hash, now]) - except IntegrityError: + except self.database_engine.module.IntegrityError: raise StoreError( 400, "User ID already taken.", errcode=Codes.USER_IN_USE ) |