diff options
| author | David Baker <dave@matrix.org> | 2018-10-09 10:05:02 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-10-09 10:05:02 +0100 |
| commit | dc045ef20222bfbe8dcb5dae297e741509cce8d1 (patch) | |
| tree | ee03ab45ce9791a06c12d15c01d3412cd101330a /synapse/federation/transport/client.py | |
| parent | Apparently this blank line is Very Important (diff) | |
| parent | Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server (diff) | |
| download | synapse-dc045ef20222bfbe8dcb5dae297e741509cce8d1.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 1054441ca5..2ab973d6c8 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -15,7 +15,8 @@ # limitations under the License. import logging -import urllib + +from six.moves import urllib from twisted.internet import defer @@ -951,4 +952,4 @@ def _create_path(prefix, path, *args): Returns: str """ - return prefix + path % tuple(urllib.quote(arg, "") for arg in args) + return prefix + path % tuple(urllib.parse.quote(arg, "") for arg in args) |