summaryrefslogtreecommitdiff
path: root/src/saml2/entity.py
diff options
context:
space:
mode:
authorRoland Hedberg <roland.hedberg@adm.umu.se>2016-03-09 09:31:46 +0100
committerRoland Hedberg <roland.hedberg@adm.umu.se>2016-03-09 09:31:46 +0100
commitc78a93298c1c4d6063eaad4ad036ce281631d882 (patch)
treeda7886ee558ed385fe855fd62a5a26a23fb9d236 /src/saml2/entity.py
parent6950abd42190f36c4b50b6ba782069a645b2b760 (diff)
downloadpysaml2-c78a93298c1c4d6063eaad4ad036ce281631d882.tar.gz
Slowly moving from six to future.backports
pycryptodomex from pypi now constructs Cryptodome module on OS X too.
Diffstat (limited to 'src/saml2/entity.py')
-rw-r--r--src/saml2/entity.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/saml2/entity.py b/src/saml2/entity.py
index 4ab74c96..f696dabc 100644
--- a/src/saml2/entity.py
+++ b/src/saml2/entity.py
@@ -1,12 +1,15 @@
import base64
-# from binascii import hexlify
-from binascii import hexlify
import copy
import logging
-from hashlib import sha1
-from Cryptodome.PublicKey import RSA
import requests
import six
+
+from binascii import hexlify
+from hashlib import sha1
+
+# from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
+
from saml2.metadata import ENDPOINTS
from saml2.profile import paos, ecp
from saml2.soap import parse_soap_enveloped_saml_artifact_resolve