diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-30 12:38:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-30 12:38:38 +0100 |
| commit | fbf6320614e23f7181e9b7d2a2ba6df0791343bb (patch) | |
| tree | cf16065c1eeffb691ab54af87dee95ed060337f9 /synapse | |
| parent | SYN-2: Allow server admins to delete room aliases (diff) | |
| download | synapse-fbf6320614e23f7181e9b7d2a2ba6df0791343bb.tar.xz | |
pyflakes cleanup
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/repository.py | 1 | ||||
| -rw-r--r-- | synapse/storage/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 407c8d6c24..b71d30227c 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -14,7 +14,6 @@ # limitations under the License. from ._base import Config -import os class ContentRepositoryConfig(Config): def __init__(self, args): diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 1ebbeab2e7..32d9c1392b 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -105,7 +105,7 @@ class DataStore(RoomMemberStore, RoomStore, stream_ordering=stream_ordering, is_new_state=is_new_state, ) - except _RollbackButIsFineException as e: + except _RollbackButIsFineException: pass @defer.inlineCallbacks diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 958e730591..ceeef5880e 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -18,7 +18,6 @@ from twisted.internet import defer from ._base import SQLBaseStore from synapse.api.constants import Membership -from synapse.util.logutils import log_function import logging |