summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2019-10-08 23:39:42 +0300
committerIvan Kanakarakis <ivan.kanak@gmail.com>2019-10-08 23:56:06 +0300
commit097063dea9061e1e10b2f80f5de8752163a925f8 (patch)
tree67dd4263b9518fe1ce08093a8ccedc47611287a3
parent6f06fc9c1900cd07924d6b9f2a27caaa0e6ea8db (diff)
downloadpysaml2-097063dea9061e1e10b2f80f5de8752163a925f8.tar.gz
Cleanup imports
Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
-rw-r--r--src/saml2/sdb.py11
-rw-r--r--tests/test_30_mdstore_old.py7
-rw-r--r--tests/test_38_metadata_filter.py12
-rwxr-xr-xtools/mdexport_test.py20
4 files changed, 7 insertions, 43 deletions
diff --git a/src/saml2/sdb.py b/src/saml2/sdb.py
index d36a8402..01c69aea 100644
--- a/src/saml2/sdb.py
+++ b/src/saml2/sdb.py
@@ -4,17 +4,6 @@ from hashlib import sha1
from saml2.ident import code_binary
-from saml2 import md
-from saml2 import saml
-from saml2.extension import mdui
-from saml2.extension import idpdisc
-from saml2.extension import dri
-from saml2.extension import mdattr
-from saml2 import xmldsig
-from saml2 import xmlenc
-
-
-__author__ = 'rolandh'
logger = logging.getLogger(__name__)
diff --git a/tests/test_30_mdstore_old.py b/tests/test_30_mdstore_old.py
index 54aa20cd..cc9a6b4c 100644
--- a/tests/test_30_mdstore_old.py
+++ b/tests/test_30_mdstore_old.py
@@ -17,14 +17,7 @@ from saml2 import saml
from saml2 import config
from saml2.attribute_converter import ac_factory
from saml2.attribute_converter import d_to_local_name
-
-from saml2.extension import mdui
-from saml2.extension import idpdisc
-from saml2.extension import dri
-from saml2.extension import mdattr
from saml2.s_utils import UnknownPrincipal
-from saml2 import xmldsig
-from saml2 import xmlenc
from pathutils import full_path
diff --git a/tests/test_38_metadata_filter.py b/tests/test_38_metadata_filter.py
index 53df0bb6..e4ebc1fa 100644
--- a/tests/test_38_metadata_filter.py
+++ b/tests/test_38_metadata_filter.py
@@ -1,18 +1,10 @@
-from saml2 import md
-from saml2 import saml
-from saml2 import config
-from saml2 import xmldsig
-from saml2 import xmlenc
+from pathutils import full_path
+from saml2 import config
from saml2.filter import AllowDescriptor
from saml2.mdstore import MetadataStore
from saml2.attribute_converter import ac_factory
-from saml2.extension import mdui
-from saml2.extension import idpdisc
-from saml2.extension import dri
-from saml2.extension import mdattr
-from pathutils import full_path
__author__ = 'roland'
diff --git a/tools/mdexport_test.py b/tools/mdexport_test.py
index d38a5d69..c8b4e49f 100755
--- a/tools/mdexport_test.py
+++ b/tools/mdexport_test.py
@@ -1,25 +1,15 @@
#!/usr/bin/env python
-import sys
-
-from saml2 import saml
-from saml2 import md
-from saml2.extension import mdui
-from saml2.extension import idpdisc
-from saml2.extension import dri
-from saml2.extension import mdattr
-from saml2.extension import shibmd
-from saml2 import xmldsig
-from saml2 import xmlenc
-
-from saml2.mdstore import MetaDataFile, MetaDataExtern
-
-__author__ = 'rolandh'
"""
A script that imports and verifies metadata and then dumps it in a basic
dictionary format.
"""
+import sys
+
+from saml2.mdstore import MetaDataExtern
+from saml2.mdstore import MetaDataFile
+
MDIMPORT = {
"swamid": {