diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 00:33:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-30 00:33:05 +0100 |
commit | 9e2601f830cbd518e838fb2ef7bd75c873e9af94 (patch) | |
tree | a9c1b32c021bd63c578f057870774dda4bef124a /synapse/config/appservice.py | |
parent | Merge pull request #3127 from matrix-org/rav/deferred_timeout (diff) | |
parent | Use six.moves.urlparse (diff) | |
download | synapse-9e2601f830cbd518e838fb2ef7bd75c873e9af94.tar.xz |
Merge pull request #3108 from NotAFile/py3-six-urlparse
Use six.moves.urlparse
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." ) |