diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-07-19 12:57:39 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-07-19 12:57:39 +0100 |
commit | ef2188c1bfd532ddc2e4c1acb533b422afde6c57 (patch) | |
tree | a9483e827cfabebcbb422c9a6426b53f928f3d31 /synapse/rest/client/v1/login.py | |
parent | d24e9b285fd8d602c3b12c6ba589da0dd2cddee3 (diff) |
Imported Upstream version 0.33.0
Diffstat (limited to 'synapse/rest/client/v1/login.py')
-rw-r--r-- | synapse/rest/client/v1/login.py | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 88ca5184..cb85fa14 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -13,30 +13,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -from twisted.internet import defer - -from synapse.api.errors import SynapseError, LoginError, Codes -from synapse.types import UserID -from synapse.http.server import finish_request -from synapse.http.servlet import parse_json_object_from_request -from synapse.util.msisdn import phone_number_to_msisdn - -from .base import ClientV1RestServlet, client_path_patterns - -from canonicaljson import json - +import logging import urllib +import xml.etree.ElementTree as ET + from six.moves.urllib import parse as urlparse -import logging -from saml2 import BINDING_HTTP_POST -from saml2 import config +from canonicaljson import json +from saml2 import BINDING_HTTP_POST, config from saml2.client import Saml2Client -import xml.etree.ElementTree as ET - +from twisted.internet import defer from twisted.web.client import PartialDownloadError +from synapse.api.errors import Codes, LoginError, SynapseError +from synapse.http.server import finish_request +from synapse.http.servlet import parse_json_object_from_request +from synapse.types import UserID +from synapse.util.msisdn import phone_number_to_msisdn + +from .base import ClientV1RestServlet, client_path_patterns logger = logging.getLogger(__name__) |