summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-15 17:15:16 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-15 21:22:43 +0200
commit2a3c33ff03aa88317c30da43cd3773c2789f0fcf (patch)
treefca219699861fab3fc172e8d0fef74ebf34f70c0 /tests/utils.py
parentMerge branch 'master' of https://github.com/matrix-org/synapse into develop (diff)
downloadsynapse-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 '')
-rw-r--r--tests/utils.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/utils.py b/tests/utils.py
index f15317d27b..9e815d8643 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
@@ -234,7 +233,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()
                     ]