summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_00_xmldsig.py6
-rw-r--r--tests/test_02_saml.py4
-rw-r--r--tests/test_03_saml2.py12
-rw-r--r--tests/test_04_samlp.py5
-rw-r--r--tests/test_05_md.py6
-rwxr-xr-xtests/test_43_soap.py14
6 files changed, 2 insertions, 45 deletions
diff --git a/tests/test_00_xmldsig.py b/tests/test_00_xmldsig.py
index c3cd1be8..059e8a04 100644
--- a/tests/test_00_xmldsig.py
+++ b/tests/test_00_xmldsig.py
@@ -7,12 +7,6 @@ __author__ = "tmatsuo@example.com (Takashi MATSUO)"
import unittest
-
-try:
- pass
-except ImportError:
- pass
-
import ds_data
import saml2.xmldsig as ds
diff --git a/tests/test_02_saml.py b/tests/test_02_saml.py
index f217fd04..a090d89f 100644
--- a/tests/test_02_saml.py
+++ b/tests/test_02_saml.py
@@ -5,10 +5,6 @@
__author__ = "roland.hedberg@adm.umu.se (Roland Hedberg)"
-try:
- pass
-except ImportError:
- pass
import ds_data
from pytest import raises
diff --git a/tests/test_03_saml2.py b/tests/test_03_saml2.py
index 20838792..b96afd9c 100644
--- a/tests/test_03_saml2.py
+++ b/tests/test_03_saml2.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+from defusedxml.common import EntitiesForbidden
from pytest import raises
import saml2_data
@@ -16,17 +17,6 @@ from saml2.saml import SubjectConfirmationData
from saml2.saml import SubjectLocality
-try:
- pass
-except ImportError:
- try:
- pass
- except ImportError:
- pass
-
-from defusedxml.common import EntitiesForbidden
-
-
ITEMS = {
NameID: [
"""<?xml version="1.0" encoding="utf-8"?>
diff --git a/tests/test_04_samlp.py b/tests/test_04_samlp.py
index 520ee91f..97e6cdb9 100644
--- a/tests/test_04_samlp.py
+++ b/tests/test_04_samlp.py
@@ -5,11 +5,6 @@
__author__ = "roland.hedberg@adm.umu.se (Roland Hedberg)"
-try:
- pass
-except ImportError:
- pass
-
import samlp_data
import saml2
diff --git a/tests/test_05_md.py b/tests/test_05_md.py
index c69bb12e..a06723b1 100644
--- a/tests/test_05_md.py
+++ b/tests/test_05_md.py
@@ -5,12 +5,6 @@
__author__ = "roland.hedberg@umu.se (Roland Hedberg)"
-
-try:
- pass
-except ImportError:
- pass
-
import ds_data
import md_data
diff --git a/tests/test_43_soap.py b/tests/test_43_soap.py
index 48182585..91a45fda 100755
--- a/tests/test_43_soap.py
+++ b/tests/test_43_soap.py
@@ -1,18 +1,6 @@
#!/usr/bin/env python
-try:
- from xml.etree import ElementTree as ElementTree
-
- if ElementTree.VERSION < "1.3.0":
- # cElementTree has no support for register_namespace
- # neither _namespace_map, thus we sacrify performance
- # for correctness
- from xml.etree import ElementTree
-except ImportError:
- try:
- import cElementTree as ElementTree
- except ImportError:
- from elementtree import ElementTree
+from xml.etree import ElementTree as ElementTree
from defusedxml.common import EntitiesForbidden
from pytest import raises