diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
| commit | 977765bde2987770f63065d839f9686a7a144140 (patch) | |
| tree | 41d3a247f546cfe50500f465e50a798a597ef464 /synapse/config/appservice.py | |
| parent | remove user agent from data model, will just join on user_ips (diff) | |
| parent | Merge pull request #2846 from kaiyou/feat-dockerfile (diff) | |
| download | synapse-977765bde2987770f63065d839f9686a7a144140.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_analytics
Diffstat (limited to 'synapse/config/appservice.py')
| -rw-r--r-- | synapse/config/appservice.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py index 9a2359b6fd..277305e184 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py @@ -17,11 +17,11 @@ from ._base import Config, ConfigError from synapse.appservice import ApplicationService from synapse.types import UserID -import urllib import yaml import logging from six import string_types +from six.moves.urllib import parse as urlparse logger = logging.getLogger(__name__) @@ -105,7 +105,7 @@ def _load_appservice(hostname, as_info, config_filename): ) localpart = as_info["sender_localpart"] - if urllib.quote(localpart) != localpart: + if urlparse.quote(localpart) != localpart: raise ValueError( "sender_localpart needs characters which are not URL encoded." ) |