diff options
author | Aarni Koskela <akx@iki.fi> | 2022-10-27 15:21:49 +0300 |
---|---|---|
committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2022-11-15 13:06:41 +0200 |
commit | 7329c6ee81a8737a79933af5a2d408f4732866e9 (patch) | |
tree | 573a7d89791a329eaa2eda04a6cb7be485c37646 | |
parent | b18599693aede393d41c5ee24b27e6bc42775559 (diff) | |
download | pysaml2-7329c6ee81a8737a79933af5a2d408f4732866e9.tar.gz |
Clean up remaining legacy `try: except ImportError:` blocks
-rw-r--r-- | src/saml2/__init__.py | 20 | ||||
-rw-r--r-- | src/saml2/pack.py | 20 | ||||
-rw-r--r-- | src/saml2/soap.py | 15 | ||||
-rw-r--r-- | tests/test_00_xmldsig.py | 6 | ||||
-rw-r--r-- | tests/test_02_saml.py | 4 | ||||
-rw-r--r-- | tests/test_03_saml2.py | 12 | ||||
-rw-r--r-- | tests/test_04_samlp.py | 5 | ||||
-rw-r--r-- | tests/test_05_md.py | 6 | ||||
-rwxr-xr-x | tests/test_43_soap.py | 14 |
9 files changed, 11 insertions, 91 deletions
diff --git a/src/saml2/__init__.py b/src/saml2/__init__.py index 8fc5ecd9..0397a365 100644 --- a/src/saml2/__init__.py +++ b/src/saml2/__init__.py @@ -17,28 +17,14 @@ """ import logging +from xml.etree import ElementTree + +import defusedxml.ElementTree from saml2.validate import valid_instance from saml2.version import version as __version__ -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 - -import defusedxml.ElementTree - - logger = logging.getLogger(__name__) NAMESPACE = "urn:oasis:names:tc:SAML:2.0:assertion" diff --git a/src/saml2/pack.py b/src/saml2/pack.py index 4a081ed1..0e6923df 100644 --- a/src/saml2/pack.py +++ b/src/saml2/pack.py @@ -18,6 +18,9 @@ except Exception: import logging from urllib.parse import urlencode from urllib.parse import urlparse +from xml.etree import ElementTree as ElementTree + +import defusedxml.ElementTree import saml2 from saml2.s_utils import deflate_and_base64_encode @@ -26,23 +29,6 @@ from saml2.sigver import RESP_ORDER from saml2.xmldsig import SIG_ALLOWED_ALG -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 - -import defusedxml.ElementTree - - logger = logging.getLogger(__name__) NAMESPACE = "http://schemas.xmlsoap.org/soap/envelope/" diff --git a/src/saml2/soap.py b/src/saml2/soap.py index 14593afb..b8015a6a 100644 --- a/src/saml2/soap.py +++ b/src/saml2/soap.py @@ -6,24 +6,15 @@ Suppport for the client part of the SAML2.0 SOAP binding. """ import logging import re +from xml.etree import ElementTree as ElementTree + +import defusedxml.ElementTree from saml2 import create_class_from_element_tree from saml2.samlp import NAMESPACE as SAMLP_NAMESPACE from saml2.schema import soapenv -try: - from xml.etree import ElementTree as ElementTree -except ImportError: - try: - import cElementTree as ElementTree - except ImportError: - # noinspection PyUnresolvedReferences - from elementtree import ElementTree - -import defusedxml.ElementTree - - logger = logging.getLogger(__name__) 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 |