From 52ac6571d423ebcbbfa3b089fdb893ae16db35e2 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 27 Oct 2017 12:37:12 +0100 Subject: [PATCH] PEP8 fix except clause and indentation --- synapse/federation/transaction_queue.py | 4 ++-- synapse/replication/slave/storage/client_ips.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index ec8ca08854..17f27e32cc 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -188,7 +188,7 @@ class TransactionQueue(object): prev_id for prev_id, _ in event.prev_events ], ) - except: + except Exception: logger.exception("Failed to calculate hosts in room") continue @@ -249,7 +249,7 @@ class TransactionQueue(object): Args: states (list(UserPresenceState)) """ - return + return # First we queue up the new presence by user ID, so multiple presence # updates in quick successtion are correctly handled diff --git a/synapse/replication/slave/storage/client_ips.py b/synapse/replication/slave/storage/client_ips.py index 4796eb166b..fedf7a3188 100644 --- a/synapse/replication/slave/storage/client_ips.py +++ b/synapse/replication/slave/storage/client_ips.py @@ -42,7 +42,7 @@ class SlavedClientIpStore(BaseSlavedStore): if last_seen is not None and (now - last_seen) < LAST_SEEN_GRANULARITY: return - self.client_ip_last_seen.prefill(key, now) + self.client_ip_last_seen.prefill(key, now) self.hs.get_tcp_replication().send_user_ip( user_id, access_token, ip, user_agent, device_id, now