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/rest/client/v1/login.py | |
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/rest/client/v1/login.py')
-rw-r--r-- | synapse/rest/client/v1/login.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 45844aa2d2..34df5be4e9 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -25,7 +25,7 @@ from .base import ClientV1RestServlet, client_path_patterns import simplejson as json import urllib -import urlparse +from six.moves.urllib import parse as urlparse import logging from saml2 import BINDING_HTTP_POST |