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 /tests/utils.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 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/utils.py b/tests/utils.py index 0cd9f7eeee..c2beb5d9f7 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -15,8 +15,7 @@ import hashlib from inspect import getcallargs -import urllib -import urlparse +from six.moves.urllib import parse as urlparse from mock import Mock, patch from twisted.internet import defer, reactor @@ -238,7 +237,7 @@ class MockHttpResource(HttpServer): if matcher: try: args = [ - urllib.unquote(u).decode("UTF-8") + urlparse.unquote(u).decode("UTF-8") for u in matcher.groups() ] |