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/rest/client/v1/login.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/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 |