[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

doc/source/conf.py

@@ -63,10 +63,10 @@
 autodoc_docstring_signature = True
 
 
-rst_prolog = '''
+rst_prolog = """
 .. role:: xml(code)
    :language: xml
-'''
+"""
 
 # LXML crossref'ing stuff:
 # LXML doesn't have an intersphinx docs,

doc/source/examples/decrypt.py

@@ -6,7 +6,7 @@
 key = xmlsec.Key.from_file('rsakey.pem', xmlsec.constants.KeyDataFormatPem)
 manager.add_key(key)
 enc_ctx = xmlsec.EncryptionContext(manager)
-root = etree.parse("enc1-res.xml").getroot()
-enc_data = xmlsec.tree.find_child(root, "EncryptedData", xmlsec.constants.EncNs)
+root = etree.parse('enc1-res.xml').getroot()
+enc_data = xmlsec.tree.find_child(root, 'EncryptedData', xmlsec.constants.EncNs)
 decrypted = enc_ctx.decrypt(enc_data)
 print(etree.tostring(decrypted))

doc/source/examples/encrypt.py

@@ -9,11 +9,11 @@
     template,
     xmlsec.constants.TransformAes128Cbc,
     type=xmlsec.constants.TypeEncElement,
-    ns="xenc",
+    ns='xenc',
 )
 
 xmlsec.template.encrypted_data_ensure_cipher_value(enc_data)
-key_info = xmlsec.template.encrypted_data_ensure_key_info(enc_data, ns="dsig")
+key_info = xmlsec.template.encrypted_data_ensure_key_info(enc_data, ns='dsig')
 enc_key = xmlsec.template.add_encrypted_key(key_info, xmlsec.constants.TransformRsaOaep)
 xmlsec.template.encrypted_data_ensure_cipher_value(enc_key)
 data = template.find('./Data')
@@ -24,20 +24,10 @@
 manager.add_key(key)
 
 enc_ctx = xmlsec.EncryptionContext(manager)
-enc_ctx.key = xmlsec.Key.generate(
-    xmlsec.constants.KeyDataAes, 128, xmlsec.constants.KeyDataTypeSession
-)
+enc_ctx.key = xmlsec.Key.generate(xmlsec.constants.KeyDataAes, 128, xmlsec.constants.KeyDataTypeSession)
 enc_data = enc_ctx.encrypt_xml(enc_data, data)
-enc_method = xmlsec.tree.find_child(
-    enc_data, xmlsec.constants.NodeEncryptionMethod, xmlsec.constants.EncNs
-)
-key_info = xmlsec.tree.find_child(
-    enc_data, xmlsec.constants.NodeKeyInfo, xmlsec.constants.DSigNs
-)
-enc_method = xmlsec.tree.find_node(
-    key_info, xmlsec.constants.NodeEncryptionMethod, xmlsec.constants.EncNs
-)
-cipher_value = xmlsec.tree.find_node(
-    key_info, xmlsec.constants.NodeCipherValue, xmlsec.constants.EncNs
-)
+enc_method = xmlsec.tree.find_child(enc_data, xmlsec.constants.NodeEncryptionMethod, xmlsec.constants.EncNs)
+key_info = xmlsec.tree.find_child(enc_data, xmlsec.constants.NodeKeyInfo, xmlsec.constants.DSigNs)
+enc_method = xmlsec.tree.find_node(key_info, xmlsec.constants.NodeEncryptionMethod, xmlsec.constants.EncNs)
+cipher_value = xmlsec.tree.find_node(key_info, xmlsec.constants.NodeCipherValue, xmlsec.constants.EncNs)
 print(etree.tostring(cipher_value))

doc/source/examples/verify.py

@@ -5,7 +5,7 @@
 with open('sign1-res.xml') as fp:
     template = etree.parse(fp).getroot()
 
-xmlsec.tree.add_ids(template, ["ID"])
+xmlsec.tree.add_ids(template, ['ID'])
 signature_node = xmlsec.tree.find_node(template, xmlsec.constants.NodeSignature)
 # Create a digital signature context (no key manager is needed).
 ctx = xmlsec.SignatureContext()

setup.py

@@ -35,7 +35,7 @@ def handle_starttag(self, tag, attrs):
 def make_request(url, github_token=None, json_response=False):
     headers = {'User-Agent': 'https://github.com/xmlsec/python-xmlsec'}
     if github_token:
-        headers['authorization'] = "Bearer " + github_token
+        headers['authorization'] = 'Bearer ' + github_token
     request = Request(url, headers=headers)
     with contextlib.closing(urlopen(request)) as r:
         charset = r.headers.get_content_charset() or 'utf-8'
@@ -74,9 +74,9 @@ def latest_release_json_from_github_api(repo):
     api_url = f'https://api.github.com/repos/{repo}/releases/latest'
 
     # if we are running in CI, pass along the GH_TOKEN, so we don't get rate limited
-    token = os.environ.get("GH_TOKEN")
+    token = os.environ.get('GH_TOKEN')
     if token:
-        log.info("Using GitHub token to avoid rate limiting")
+        log.info('Using GitHub token to avoid rate limiting')
     return make_request(api_url, token, json_response=True)
 
 
@@ -114,7 +114,7 @@ def __init__(self, host, arch, compiler):
 
     @property
     def triplet(self):
-        return f"{self.host}-{self.arch}-{self.compiler}"
+        return f'{self.host}-{self.arch}-{self.compiler}'
 
 
 class build_ext(build_ext_orig):
@@ -309,9 +309,7 @@ def prepare_static_build(self, build_platform):
                 self.info('{:10}: {}'.format('zlib', f'PYXMLSEC_ZLIB_VERSION unset, downloading latest from {url}'))
             else:
                 url = f'https://zlib.net/fossils/zlib-{self.zlib_version}.tar.gz'
-                self.info(
-                    '{:10}: {}'.format('zlib', f'PYXMLSEC_ZLIB_VERSION={self.zlib_version}, downloading from {url}')
-                )
+                self.info('{:10}: {}'.format('zlib', f'PYXMLSEC_ZLIB_VERSION={self.zlib_version}, downloading from {url}'))
             urlretrieve(url, str(zlib_tar))
 
         # fetch libiconv
@@ -325,9 +323,7 @@ def prepare_static_build(self, build_platform):
             else:
                 url = f'https://ftp.gnu.org/pub/gnu/libiconv/libiconv-{self.libiconv_version}.tar.gz'
                 self.info(
-                    '{:10}: {}'.format(
-                        'zlib', f'PYXMLSEC_LIBICONV_VERSION={self.libiconv_version}, downloading from {url}'
-                    )
+                    '{:10}: {}'.format('zlib', f'PYXMLSEC_LIBICONV_VERSION={self.libiconv_version}, downloading from {url}')
                 )
             urlretrieve(url, str(libiconv_tar))
 
@@ -342,9 +338,7 @@ def prepare_static_build(self, build_platform):
                 version_prefix, _ = self.libxml2_version.rsplit('.', 1)
                 url = f'https://download.gnome.org/sources/libxml2/{version_prefix}/libxml2-{self.libxml2_version}.tar.xz'
                 self.info(
-                    '{:10}: {}'.format(
-                        'libxml2', f'PYXMLSEC_LIBXML2_VERSION={self.libxml2_version}, downloading from {url}'
-                    )
+                    '{:10}: {}'.format('libxml2', f'PYXMLSEC_LIBXML2_VERSION={self.libxml2_version}, downloading from {url}')
                 )
             libxml2_tar = self.libs_dir / 'libxml2.tar.xz'
             urlretrieve(url, str(libxml2_tar))
@@ -360,9 +354,7 @@ def prepare_static_build(self, build_platform):
                 version_prefix, _ = self.libxslt_version.rsplit('.', 1)
                 url = f'https://download.gnome.org/sources/libxslt/{version_prefix}/libxslt-{self.libxslt_version}.tar.xz'
                 self.info(
-                    '{:10}: {}'.format(
-                        'libxslt', f'PYXMLSEC_LIBXSLT_VERSION={self.libxslt_version}, downloading from {url}'
-                    )
+                    '{:10}: {}'.format('libxslt', f'PYXMLSEC_LIBXSLT_VERSION={self.libxslt_version}, downloading from {url}')
                 )
             libxslt_tar = self.libs_dir / 'libxslt.tar.gz'
             urlretrieve(url, str(libxslt_tar))
@@ -377,9 +369,7 @@ def prepare_static_build(self, build_platform):
             else:
                 url = f'https://github.com/lsh123/xmlsec/releases/download/{self.xmlsec1_version}/xmlsec1-{self.xmlsec1_version}.tar.gz'
                 self.info(
-                    '{:10}: {}'.format(
-                        'xmlsec1', f'PYXMLSEC_XMLSEC1_VERSION={self.xmlsec1_version}, downloading from {url}'
-                    )
+                    '{:10}: {}'.format('xmlsec1', f'PYXMLSEC_XMLSEC1_VERSION={self.xmlsec1_version}, downloading from {url}')
                 )
             xmlsec1_tar = self.libs_dir / 'xmlsec1.tar.gz'
             urlretrieve(url, str(xmlsec1_tar))
@@ -415,7 +405,7 @@ def prepare_static_build(self, build_platform):
                 cross_compiling = CrossCompileInfo('darwin64', arch, 'cc')
             major_version, _ = tuple(map(int, platform.mac_ver()[0].split('.')[:2]))
             if major_version >= 11 and 'MACOSX_DEPLOYMENT_TARGET' not in env:
-                    env['MACOSX_DEPLOYMENT_TARGET'] = "11.0"
+                env['MACOSX_DEPLOYMENT_TARGET'] = '11.0'
 
         env['CFLAGS'] = ' '.join(cflags)
         env['LDFLAGS'] = ' '.join(ldflags)
@@ -430,9 +420,7 @@ def prepare_static_build(self, build_platform):
             openssl_config_cmd.insert(0, './config')
         subprocess.check_call(openssl_config_cmd, cwd=str(openssl_dir), env=env)
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}'], cwd=str(openssl_dir), env=env)
-        subprocess.check_call(
-            ['make', f'-j{multiprocessing.cpu_count() + 1}', 'install_sw'], cwd=str(openssl_dir), env=env
-        )
+        subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install_sw'], cwd=str(openssl_dir), env=env)
 
         self.info('Building zlib')
         zlib_dir = next(self.build_libs_dir.glob('zlib-*'))
@@ -594,7 +582,7 @@ def prepare_static_build(self, build_platform):
     python_requires='>=3.9',
     setup_requires=setup_reqs,
     install_requires=['lxml>=3.8'],
-    author="Bulat Gaifullin",
+    author='Bulat Gaifullin',
     author_email='[email protected]',
     maintainer='Oleg Hoefling',
     maintainer_email='[email protected]',

tests/base.py

@@ -25,11 +25,11 @@ class TestMemoryLeaks(unittest.TestCase):
 
     iterations = test_iterations
 
-    data_dir = os.path.join(os.path.dirname(__file__), "data")
+    data_dir = os.path.join(os.path.dirname(__file__), 'data')
 
     def setUp(self):
         gc.disable()
-        self.addTypeEqualityFunc(etype, "assertXmlEqual")
+        self.addTypeEqualityFunc(etype, 'assertXmlEqual')
         xmlsec.enable_debug_trace(1)
 
     def run(self, result=None):
@@ -58,13 +58,13 @@ def run(self, result=None):
         if m_hits > int(self.iterations * 0.8):
             result.buffer = False
             try:
-                raise AssertionError("memory leak detected")
+                raise AssertionError('memory leak detected')
             except AssertionError:
                 result.addError(self, sys.exc_info())
         if o_hits > int(self.iterations * 0.8):
             result.buffer = False
             try:
-                raise AssertionError("unreferenced objects detected")
+                raise AssertionError('unreferenced objects detected')
             except AssertionError:
                 result.addError(self, sys.exc_info())
 
@@ -74,7 +74,7 @@ def path(self, name):
 
     def load(self, name):
         """Load resource by name."""
-        with open(self.path(name), "rb") as stream:
+        with open(self.path(name), 'rb') as stream:
             return stream.read()
 
     def load_xml(self, name, xpath=None):

tests/softhsm_setup.py

@@ -223,7 +223,7 @@ def setup() -> None:
                         '[pkcs11_section]',
                         'engine_id = pkcs11',
                         # dynamic_path,
-                        "MODULE_PATH = {}".format(component_path['P11_MODULE']),
+                        'MODULE_PATH = {}'.format(component_path['P11_MODULE']),
                         'init = 0',
                     ]
                 )