diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-09-07 00:22:23 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-07 00:22:23 +1000 |
commit | 2608ebc04c8b7ffb3417eeb720801d70ddc7dccd (patch) | |
tree | 44cf4eae9b110f8f59af56ea1e302676b0fb1083 /synapse/handlers/federation.py | |
parent | Merge branch 'master' into develop (diff) | |
download | synapse-2608ebc04c8b7ffb3417eeb720801d70ddc7dccd.tar.xz |
Port handlers/ to Python 3 (#3803)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 3fa7a98445..0c68e8a472 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -594,7 +594,7 @@ class FederationHandler(BaseHandler): required_auth = set( a_id - for event in events + state_events.values() + auth_events.values() + for event in events + list(state_events.values()) + list(auth_events.values()) for a_id, _ in event.auth_events ) auth_events.update({ @@ -802,7 +802,7 @@ class FederationHandler(BaseHandler): ) continue except NotRetryingDestination as e: - logger.info(e.message) + logger.info(str(e)) continue except FederationDeniedError as e: logger.info(e) @@ -1358,7 +1358,7 @@ class FederationHandler(BaseHandler): ) if state_groups: - _, state = state_groups.items().pop() + _, state = list(state_groups.items()).pop() results = state if event.is_state(): |