fixes for python 3.10 support

Author: leifj

src/xmlsec/__init__.py

@@ -311,6 +311,7 @@ def _verify(t, keyspec, sig_path=".//{%s}Signature" % NS['ds'], drop_signature=F
                 raise XMLSigException("No SignatureValue")
 
             log.debug("SignatureValue: {!s}".format(sv))
+            log.debug("KeySpec: {!s}".format(keyspec))
             this_cert = xmlsec.crypto.from_keyspec(keyspec, signature_element=sig)
             log.debug("key size: {!s} bits".format(this_cert.keysize))
 

src/xmlsec/test/case.py

@@ -5,35 +5,37 @@
 __author__ = 'leifj'
 
 import os
-import pkg_resources
 from defusedxml import lxml
 from lxml import etree
 from six.moves import StringIO
 import xmlsec
+from importlib_resources import files
 
 
 class XMLTestDataException(Exception):
     pass
 
 
 class XMLTestData():
-    def __init__(self, base, name):
-        self.base = base
-        self.name = name
+    def __init__(self, path):
+        self.path = path 
         self.data = {}
-        for fn in pkg_resources.resource_listdir(self.base, self.name):
-            if fn.endswith(".xml"):
-                with pkg_resources.resource_stream(self.base, "%s/%s" % (self.name, fn)) as data:
-                    self.data[fn] = data.read()
+        for fn in self.path.iterdir():
+            if fn.name.endswith(".xml"):
+                self.data[fn.name] = fn.read_bytes()
 
     def has_data(self, n):
         return n in self.data
 
     def __str__(self):
-        return "Testcase {}/{}".format(self.base, self.name)
+        return "Testcase {}".format(self.path)
+
+    @property
+    def name(self):
+        return self.path.name
 
     def as_buf(self, n):
-        assert n in self.data, XMLTestDataException("No data named %s in test case %s" % (n, self.name))
+        assert n in self.data, XMLTestDataException("No data named %s in test case %s" % (n, self))
         return self.data[n]
 
     def as_etree(self, n, remove_whitespace=False, remove_comments=False):
@@ -47,8 +49,7 @@ def load_test_data(path=None):
     if not path:
         return  # fool unittest that executes this function
     cases = {}
-    for case_n in pkg_resources.resource_listdir(__name__, path):
-        if case_n[0] != '.': # ignore hidden files/directories
-            case = XMLTestData(__name__, os.path.join(path, case_n))
-            cases[case_n] = case
+    for case_n in files(__name__).joinpath(path).iterdir():
+        if case_n.name[0] != '.': # ignore hidden files/directories
+            cases[case_n.name] = XMLTestData(case_n)
     return cases

src/xmlsec/test/sign_verify_test.py

@@ -4,13 +4,13 @@
 import copy
 import unittest
 import xmlsec
-import pkg_resources
 from xmlsec.test.case import load_test_data
 from xmlsec import constants, utils
 import six
 import base64
 from . import find_alts, run_cmd
 import tempfile
+from importlib_resources import files
 
 __author__ = 'ft'
 
@@ -39,9 +39,9 @@ def _get_all_signatures(t):
 
 class TestSignVerifyXmlSec1(unittest.TestCase):
     def setUp(self):
-        self.datadir = pkg_resources.resource_filename(__name__, 'data')
-        self.private_keyspec = os.path.join(self.datadir, 'test.key')
-        self.public_keyspec = os.path.join(self.datadir, 'test.pem')
+        self.datadir = files(__name__).joinpath('data')
+        self.private_keyspec = str(self.datadir.joinpath('test.key'))
+        self.public_keyspec = str(self.datadir.joinpath('test.pem'))
         self.cases = load_test_data('data/verifyxmlsec1')
         self.tmpf = tempfile.NamedTemporaryFile(delete=False)
 
@@ -80,38 +80,39 @@ def tearDown(self):
 class TestVerify(unittest.TestCase):
 
     def setUp(self):
-        self.datadir = pkg_resources.resource_filename(__name__, 'data')
-        self.resource_dir = pkg_resources.resource_filename(__name__, '')
+        self.datadir = files(__name__).joinpath('data')
+        self.resource_dir = self.datadir.joinpath('verify')
         self.cases = load_test_data('data/verify')
 
     def test_verify_all(self):
         for case in self.cases.values():
-            print(str(case))
-            public_keyspec = os.path.join(self.resource_dir, case.name, "signer.crt")
+            public_keyspec = str(self.resource_dir.joinpath(case.name).joinpath("signer.crt"))
             res = xmlsec.verify(case.as_etree("in.xml"), public_keyspec)
             self.assertTrue(res)
 
     def test_verify_one(self):
         case = self.cases['it-connector']
-        public_keyspec = os.path.join(self.resource_dir, case.name, "signer.crt")
+        public_keyspec = str(self.resource_dir.joinpath('it-connector').joinpath("signer.crt"))
         res = xmlsec.verify(case.as_etree("in.xml"), public_keyspec)
         self.assertTrue(res)
 
     def test_verify_pss_mgf1(self):
         case = self.cases['eesti']
-        public_keyspec = os.path.join(self.resource_dir, case.name, "signer.crt")
+        public_keyspec = str(self.resource_dir.joinpath('eesti').joinpath("signer.crt"))
         res = xmlsec.verify(case.as_etree("in.xml"), public_keyspec)
         self.assertTrue(res)
 
 
 class TestSignVerify(unittest.TestCase):
 
     def setUp(self):
-        self.datadir = pkg_resources.resource_filename(__name__, 'data')
-        self.private_keyspec = os.path.join(self.datadir, 'test.key')
-        self.public_keyspec = os.path.join(self.datadir, 'test.pem')
+        self.datadir = files(__name__).joinpath('data')
+        self.resource_dir = self.datadir.joinpath('signverify')
+        self.private_keyspec = str(self.datadir.joinpath('test.key'))
+        self.public_keyspec = str(self.datadir.joinpath('test.pem'))
         self.cases = load_test_data('data/signverify')
 
+
     def test_sign_verify_SAML_assertion1(self):
         """
         Test signing a SAML assertion, and making sure we can verify it.
@@ -431,7 +432,7 @@ def test_mm_with_inner_signature(self):
         print("Signed   SignatureValue: %s" % (repr(signed_sv)))
         print("Expected SignatureValue: %s" % (repr(expected_sv)))
 
-        self.assertEquals(digest, expected_digest)
+        self.assertEqual(digest, expected_digest)
         self.assertEqual(signed_sv, expected_sv)
 
     def test_verify_href(self):

src/xmlsec/test/transform_test.py

@@ -1,5 +1,4 @@
-import pkg_resources
-
+from importlib_resources import files
 __author__ = 'leifj'
 
 import unittest
@@ -12,9 +11,8 @@
 class TestTransforms(unittest.TestCase):
     def setUp(self):
         self.cases = {}
-        for case_n in pkg_resources.resource_listdir(__name__, "data/transform"):
-            case = XMLTestData(__name__, "data/transform/%s" % case_n)
-            self.cases[case_n] = case
+        for case_n in files(__name__).joinpath("data/transform").iterdir():
+            self.cases[case_n.name] = XMLTestData(case_n)
 
     def test_enveloped1(self):
         case = self.cases['enveloped1']

test_requirements.txt

@@ -0,0 +1 @@
+importlib_resources