diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-20 11:59:14 +0100 |
| commit | 45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3 (patch) | |
| tree | 07bb21377c6611db89f64f948a2e27645662ff0e /synapse/util/threepids.py | |
| parent | Add descriptions and remove redundant set(..) (diff) | |
| parent | Run Black. (#5482) (diff) | |
| download | synapse-45f28a9d2fc0466dcf2a05b0063b7caa3b7e12c3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_extremities
Diffstat (limited to 'synapse/util/threepids.py')
| -rw-r--r-- | synapse/util/threepids.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/util/threepids.py b/synapse/util/threepids.py index 75efa0117b..3ec1dfb0c2 100644 --- a/synapse/util/threepids.py +++ b/synapse/util/threepids.py @@ -35,11 +35,13 @@ def check_3pid_allowed(hs, medium, address): for constraint in hs.config.allowed_local_3pids: logger.debug( "Checking 3PID %s (%s) against %s (%s)", - address, medium, constraint['pattern'], constraint['medium'], + address, + medium, + constraint["pattern"], + constraint["medium"], ) - if ( - medium == constraint['medium'] and - re.match(constraint['pattern'], address) + if medium == constraint["medium"] and re.match( + constraint["pattern"], address ): return True else: |