diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-10-01 08:09:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-01 08:09:18 -0400 |
| commit | 4ff0201e6235b8b2efc5ce5a7dc3c479ea96df53 (patch) | |
| tree | 632703075ef78aac894ac884f6fe722ec0b8784a /synapse/federation/federation_server.py | |
| parent | Add prometheus metrics to track federation delays (#8430) (diff) | |
| download | synapse-4ff0201e6235b8b2efc5ce5a7dc3c479ea96df53.tar.xz | |
Enable mypy checking for unreachable code and fix instances. (#8432)
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 24329dd0e3..02f11e1209 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -22,7 +22,6 @@ from typing import ( Callable, Dict, List, - Match, Optional, Tuple, Union, @@ -825,14 +824,14 @@ def server_matches_acl_event(server_name: str, acl_event: EventBase) -> bool: return False -def _acl_entry_matches(server_name: str, acl_entry: str) -> Match: +def _acl_entry_matches(server_name: str, acl_entry: Any) -> bool: if not isinstance(acl_entry, str): logger.warning( "Ignoring non-str ACL entry '%s' (is %s)", acl_entry, type(acl_entry) ) return False regex = glob_to_regex(acl_entry) - return regex.match(server_name) + return bool(regex.match(server_name)) class FederationHandlerRegistry: |