diff options
author | Adrian Tschira <nota@notafile.com> | 2018-04-15 17:15:16 +0200 |
---|---|---|
committer | Adrian Tschira <nota@notafile.com> | 2018-04-15 21:22:43 +0200 |
commit | 2a3c33ff03aa88317c30da43cd3773c2789f0fcf (patch) | |
tree | fca219699861fab3fc172e8d0fef74ebf34f70c0 /synapse/config | |
parent | Merge branch 'master' of https://github.com/matrix-org/synapse into develop (diff) | |
download | synapse-2a3c33ff03aa88317c30da43cd3773c2789f0fcf.tar.xz |
Use six.moves.urlparse
The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/config')
-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." ) |