diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-23 17:39:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 17:39:31 +0100 |
| commit | 0d437698b2e040eface5094852576c43916c2e0c (patch) | |
| tree | 9090c6c6f5ba5566786b8654cee07b3c3acd97c8 /tests | |
| parent | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff) | |
| parent | fix vars named `l` (diff) | |
| download | synapse-0d437698b2e040eface5094852576c43916c2e0c.tar.xz | |
Merge pull request #2568 from matrix-org/rav/pep8
PEP8 fixes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/storage/test_appservice.py | 2 | ||||
| -rw-r--r-- | tests/utils.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py index 9e98d0e330..79f569e787 100644 --- a/tests/storage/test_appservice.py +++ b/tests/storage/test_appservice.py @@ -65,7 +65,7 @@ class ApplicationServiceStoreTestCase(unittest.TestCase): for f in self.as_yaml_files: try: os.remove(f) - except: + except Exception: pass def _add_appservice(self, as_token, id, url, hs_token, sender): diff --git a/tests/utils.py b/tests/utils.py index 3c81a3e16d..d2ebce4b2e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -184,7 +184,7 @@ class MockHttpResource(HttpServer): mock_request.args = urlparse.parse_qs(path.split('?')[1]) mock_request.path = path.split('?')[0] path = mock_request.path - except: + except Exception: pass for (method, pattern, func) in self.callbacks: @@ -364,13 +364,13 @@ class MemoryDataStore(object): return { "name": self.tokens_to_users[token], } - except: + except Exception: raise StoreError(400, "User does not exist.") def get_room(self, room_id): try: return self.rooms[room_id] - except: + except Exception: return None def store_room(self, room_id, room_creator_user_id, is_public): @@ -499,7 +499,7 @@ class DeferredMockCallable(object): for _, _, d in self.expectations: try: d.errback(failure) - except: + except Exception: pass raise failure |