diff --git a/plugins/action/openssl_privatekey_pipe.py b/plugins/action/openssl_privatekey_pipe.py index 2043f47b..d74fbe90 100644 --- a/plugins/action/openssl_privatekey_pipe.py +++ b/plugins/action/openssl_privatekey_pipe.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 @@ -25,7 +19,7 @@ from ansible_collections.community.crypto.plugins.plugin_utils.action_module imp ) -class PrivateKeyModule(object): +class PrivateKeyModule: def __init__(self, module, module_backend): self.module = module self.module_backend = module_backend diff --git a/plugins/doc_fragments/acme.py b/plugins/doc_fragments/acme.py index 6d2ab842..3eab486d 100644 --- a/plugins/doc_fragments/acme.py +++ b/plugins/doc_fragments/acme.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Basic documentation fragment without account data BASIC = r""" diff --git a/plugins/doc_fragments/attributes.py b/plugins/doc_fragments/attributes.py index 94da6a17..de8e4f5e 100644 --- a/plugins/doc_fragments/attributes.py +++ b/plugins/doc_fragments/attributes.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/ecs_credential.py b/plugins/doc_fragments/ecs_credential.py index 296e1e86..d9d4c1be 100644 --- a/plugins/doc_fragments/ecs_credential.py +++ b/plugins/doc_fragments/ecs_credential.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c), Entrust Datacard Corporation, 2019 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Plugin options for Entrust Certificate Services (ECS) credentials DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/module_certificate.py b/plugins/doc_fragments/module_certificate.py index 8ae16fe6..4145d05b 100644 --- a/plugins/doc_fragments/module_certificate.py +++ b/plugins/doc_fragments/module_certificate.py @@ -1,17 +1,12 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/module_csr.py b/plugins/doc_fragments/module_csr.py index 5d97fd91..0ec9074f 100644 --- a/plugins/doc_fragments/module_csr.py +++ b/plugins/doc_fragments/module_csr.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2017, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/module_privatekey.py b/plugins/doc_fragments/module_privatekey.py index daee6bc0..9faa5c4a 100644 --- a/plugins/doc_fragments/module_privatekey.py +++ b/plugins/doc_fragments/module_privatekey.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/module_privatekey_convert.py b/plugins/doc_fragments/module_privatekey_convert.py index a55be1e7..92d9a104 100644 --- a/plugins/doc_fragments/module_privatekey_convert.py +++ b/plugins/doc_fragments/module_privatekey_convert.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: # Standard files documentation fragment DOCUMENTATION = r""" diff --git a/plugins/doc_fragments/name_encoding.py b/plugins/doc_fragments/name_encoding.py index 7f3030cf..1bf327ab 100644 --- a/plugins/doc_fragments/name_encoding.py +++ b/plugins/doc_fragments/name_encoding.py @@ -1,16 +1,11 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - - -class ModuleDocFragment(object): +class ModuleDocFragment: DOCUMENTATION = r""" options: name_encoding: diff --git a/plugins/filter/gpg_fingerprint.py b/plugins/filter/gpg_fingerprint.py index 581a2013..24e682ff 100644 --- a/plugins/filter/gpg_fingerprint.py +++ b/plugins/filter/gpg_fingerprint.py @@ -1,13 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2023, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: gpg_fingerprint short_description: Retrieve a GPG fingerprint from a GPG public or private key @@ -68,7 +65,7 @@ def gpg_fingerprint(input): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/openssl_csr_info.py b/plugins/filter/openssl_csr_info.py index 2dd90542..8fa6909e 100644 --- a/plugins/filter/openssl_csr_info.py +++ b/plugins/filter/openssl_csr_info.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: openssl_csr_info short_description: Retrieve information from OpenSSL Certificate Signing Requests (CSR) @@ -320,7 +316,7 @@ def openssl_csr_info_filter(data, name_encoding="ignore"): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/openssl_privatekey_info.py b/plugins/filter/openssl_privatekey_info.py index 7c019e19..467369e5 100644 --- a/plugins/filter/openssl_privatekey_info.py +++ b/plugins/filter/openssl_privatekey_info.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: openssl_privatekey_info short_description: Retrieve information from OpenSSL private keys @@ -202,7 +198,7 @@ def openssl_privatekey_info_filter( raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/openssl_publickey_info.py b/plugins/filter/openssl_publickey_info.py index 0d6956a4..4741adfd 100644 --- a/plugins/filter/openssl_publickey_info.py +++ b/plugins/filter/openssl_publickey_info.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: openssl_publickey_info short_description: Retrieve information from OpenSSL public keys in PEM format @@ -159,7 +155,7 @@ def openssl_publickey_info_filter(data): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/parse_serial.py b/plugins/filter/parse_serial.py index 1049d5bd..7c5ba4be 100644 --- a/plugins/filter/parse_serial.py +++ b/plugins/filter/parse_serial.py @@ -1,13 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: parse_serial short_description: Convert a serial number as a colon-separated list of hex numbers to an integer @@ -63,7 +60,7 @@ def parse_serial_filter(input): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/split_pem.py b/plugins/filter/split_pem.py index 82228152..63c18b69 100644 --- a/plugins/filter/split_pem.py +++ b/plugins/filter/split_pem.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: split_pem short_description: Split PEM file contents into multiple objects @@ -62,7 +58,7 @@ def split_pem_filter(data): return split_pem_list(data) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/to_serial.py b/plugins/filter/to_serial.py index f02091d1..6c0bc389 100644 --- a/plugins/filter/to_serial.py +++ b/plugins/filter/to_serial.py @@ -1,13 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: to_serial short_description: Convert an integer to a colon-separated list of hex numbers @@ -65,7 +62,7 @@ def to_serial_filter(input): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/x509_certificate_info.py b/plugins/filter/x509_certificate_info.py index 6e1af832..8e85881f 100644 --- a/plugins/filter/x509_certificate_info.py +++ b/plugins/filter/x509_certificate_info.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: x509_certificate_info short_description: Retrieve information from X.509 certificates in PEM format @@ -352,7 +348,7 @@ def x509_certificate_info_filter(data, name_encoding="ignore"): raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/filter/x509_crl_info.py b/plugins/filter/x509_crl_info.py index 7da0cefe..15b53d11 100644 --- a/plugins/filter/x509_crl_info.py +++ b/plugins/filter/x509_crl_info.py @@ -1,14 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: x509_crl_info short_description: Retrieve information from X.509 CRLs in PEM format @@ -217,7 +213,7 @@ def x509_crl_info_filter(data, name_encoding="ignore", list_revoked_certificates raise AnsibleFilterError(to_native(exc)) -class FilterModule(object): +class FilterModule: """Ansible jinja2 filters""" def filters(self): diff --git a/plugins/lookup/gpg_fingerprint.py b/plugins/lookup/gpg_fingerprint.py index e36c4713..57350a70 100644 --- a/plugins/lookup/gpg_fingerprint.py +++ b/plugins/lookup/gpg_fingerprint.py @@ -1,13 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2023, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" name: gpg_fingerprint short_description: Retrieve a GPG fingerprint from a GPG public or private key file diff --git a/plugins/module_utils/acme/account.py b/plugins/module_utils/acme/account.py index 8c8742f5..cc8af4b1 100644 --- a/plugins/module_utils/acme/account.py +++ b/plugins/module_utils/acme/account.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible.module_utils.common._collections_compat import Mapping from ansible_collections.community.crypto.plugins.module_utils.acme.errors import ( @@ -18,7 +12,7 @@ from ansible_collections.community.crypto.plugins.module_utils.acme.errors impor ) -class ACMEAccount(object): +class ACMEAccount: """ ACME account object. Allows to create new accounts, check for existence of accounts, retrieve account data. diff --git a/plugins/module_utils/acme/acme.py b/plugins/module_utils/acme/acme.py index 8c3cfa27..a0f08e4c 100644 --- a/plugins/module_utils/acme/acme.py +++ b/plugins/module_utils/acme/acme.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import copy import datetime @@ -123,7 +117,7 @@ def _is_failed(info, expected_status_codes=None): return False -class ACMEDirectory(object): +class ACMEDirectory: """ The ACME server directory. Gives access to the available resources, and allows to obtain a Replay-Nonce. The acme_directory URL @@ -199,7 +193,7 @@ class ACMEDirectory(object): return "renewalInfo" in self.directory -class ACMEClient(object): +class ACMEClient: """ ACME client object. Handles the authorized communication with the ACME server. diff --git a/plugins/module_utils/acme/backend_cryptography.py b/plugins/module_utils/acme/backend_cryptography.py index e4bfe6d2..51a5c5cf 100644 --- a/plugins/module_utils/acme/backend_cryptography.py +++ b/plugins/module_utils/acme/backend_cryptography.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import binascii diff --git a/plugins/module_utils/acme/backend_openssl_cli.py b/plugins/module_utils/acme/backend_openssl_cli.py index ae9238e5..73dc3228 100644 --- a/plugins/module_utils/acme/backend_openssl_cli.py +++ b/plugins/module_utils/acme/backend_openssl_cli.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import binascii diff --git a/plugins/module_utils/acme/backends.py b/plugins/module_utils/acme/backends.py index c7213b05..2b98ed3d 100644 --- a/plugins/module_utils/acme/backends.py +++ b/plugins/module_utils/acme/backends.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import datetime @@ -99,7 +93,7 @@ def _parse_acme_timestamp(timestamp_str, with_timezone): @six.add_metaclass(abc.ABCMeta) -class CryptoBackend(object): +class CryptoBackend: def __init__(self, module, with_timezone=False): self.module = module self._with_timezone = with_timezone diff --git a/plugins/module_utils/acme/certificate.py b/plugins/module_utils/acme/certificate.py index a8509381..0ed1993d 100644 --- a/plugins/module_utils/acme/certificate.py +++ b/plugins/module_utils/acme/certificate.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2024 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import os @@ -36,7 +30,7 @@ from ansible_collections.community.crypto.plugins.module_utils.acme.utils import ) -class ACMECertificateClient(object): +class ACMECertificateClient: """ ACME v2 client class. Uses an ACME account object and a CSR to start and validate ACME challenges and download the respective diff --git a/plugins/module_utils/acme/certificates.py b/plugins/module_utils/acme/certificates.py index c1c135aa..fea162ec 100644 --- a/plugins/module_utils/acme/certificates.py +++ b/plugins/module_utils/acme/certificates.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc @@ -26,7 +20,7 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.pem import ) -class CertificateChain(object): +class CertificateChain: """ Download and parse the certificate chain. https://tools.ietf.org/html/rfc8555#section-7.4.2 @@ -98,7 +92,7 @@ class CertificateChain(object): } -class Criterium(object): +class Criterium: def __init__(self, criterium, index=None): self.index = index self.test_certificates = criterium["test_certificates"] @@ -109,7 +103,7 @@ class Criterium(object): @six.add_metaclass(abc.ABCMeta) -class ChainMatcher(object): +class ChainMatcher: @abc.abstractmethod def match(self, certificate): """ diff --git a/plugins/module_utils/acme/challenges.py b/plugins/module_utils/acme/challenges.py index adb2fd7c..d18aa59e 100644 --- a/plugins/module_utils/acme/challenges.py +++ b/plugins/module_utils/acme/challenges.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import hashlib @@ -68,7 +62,7 @@ def split_identifier(identifier): return parts -class Challenge(object): +class Challenge: def __init__(self, data, url): self.data = data @@ -141,7 +135,7 @@ class Challenge(object): return None -class Authorization(object): +class Authorization: def _setup(self, client, data): data["uri"] = self.url self.data = data diff --git a/plugins/module_utils/acme/errors.py b/plugins/module_utils/acme/errors.py index 12fe5c4e..f1118772 100644 --- a/plugins/module_utils/acme/errors.py +++ b/plugins/module_utils/acme/errors.py @@ -1,14 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.six import PY3, binary_type diff --git a/plugins/module_utils/acme/io.py b/plugins/module_utils/acme/io.py index 4acd440a..4f6f6681 100644 --- a/plugins/module_utils/acme/io.py +++ b/plugins/module_utils/acme/io.py @@ -1,16 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2013, Romeo Theriault # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import os import shutil diff --git a/plugins/module_utils/acme/orders.py b/plugins/module_utils/acme/orders.py index ddcc7d11..5b0d47f0 100644 --- a/plugins/module_utils/acme/orders.py +++ b/plugins/module_utils/acme/orders.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import time @@ -25,7 +19,7 @@ from ansible_collections.community.crypto.plugins.module_utils.acme.utils import ) -class Order(object): +class Order: def _setup(self, client, data): self.data = data diff --git a/plugins/module_utils/acme/utils.py b/plugins/module_utils/acme/utils.py index 2aed4f0c..7321dcef 100644 --- a/plugins/module_utils/acme/utils.py +++ b/plugins/module_utils/acme/utils.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import datetime diff --git a/plugins/module_utils/argspec.py b/plugins/module_utils/argspec.py index 59450b42..ea5d8365 100644 --- a/plugins/module_utils/argspec.py +++ b/plugins/module_utils/argspec.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible.module_utils.basic import AnsibleModule @@ -83,7 +77,7 @@ class ArgumentSpec: required_one_of=self.required_one_of, required_if=self.required_if, required_by=self.required_by, - **kwargs + **kwargs, ) def create_ansible_module(self, **kwargs): diff --git a/plugins/module_utils/crypto/_asn1.py b/plugins/module_utils/crypto/_asn1.py index 8cd5e542..17479b4f 100644 --- a/plugins/module_utils/crypto/_asn1.py +++ b/plugins/module_utils/crypto/_asn1.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Jordan Borean # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import re diff --git a/plugins/module_utils/crypto/_obj2txt.py b/plugins/module_utils/crypto/_obj2txt.py index 30c9348c..e115c606 100644 --- a/plugins/module_utils/crypto/_obj2txt.py +++ b/plugins/module_utils/crypto/_obj2txt.py @@ -26,10 +26,7 @@ # pyca/cryptography@3057f91ea9a05fb593825006d87a391286a4d828 # pyca/cryptography@d607dd7e5bc5c08854ec0c9baff70ba4a35be36f -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations # WARNING: this function no longer works with cryptography 35.0.0 and newer! diff --git a/plugins/module_utils/crypto/_objects.py b/plugins/module_utils/crypto/_objects.py index 32cf23a4..22b2c642 100644 --- a/plugins/module_utils/crypto/_objects.py +++ b/plugins/module_utils/crypto/_objects.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ._objects_data import OID_MAP diff --git a/plugins/module_utils/crypto/_objects_data.py b/plugins/module_utils/crypto/_objects_data.py index 4c199715..3c62f976 100644 --- a/plugins/module_utils/crypto/_objects_data.py +++ b/plugins/module_utils/crypto/_objects_data.py @@ -14,10 +14,7 @@ # SPDX-License-Identifier: Apache-2.0 # https://github.com/openssl/openssl/blob/master/LICENSE.txt or LICENSES/Apache-2.0.txt -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations OID_MAP = { diff --git a/plugins/module_utils/crypto/basic.py b/plugins/module_utils/crypto/basic.py index fc000e34..da432c2a 100644 --- a/plugins/module_utils/crypto/basic.py +++ b/plugins/module_utils/crypto/basic.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016, Yanis Guenane # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible_collections.community.crypto.plugins.module_utils.version import ( LooseVersion, diff --git a/plugins/module_utils/crypto/cryptography_crl.py b/plugins/module_utils/crypto/cryptography_crl.py index 3f979189..50fed969 100644 --- a/plugins/module_utils/crypto/cryptography_crl.py +++ b/plugins/module_utils/crypto/cryptography_crl.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible_collections.community.crypto.plugins.module_utils.version import ( LooseVersion as _LooseVersion, diff --git a/plugins/module_utils/crypto/cryptography_support.py b/plugins/module_utils/crypto/cryptography_support.py index 8c79fa77..ba622681 100644 --- a/plugins/module_utils/crypto/cryptography_support.py +++ b/plugins/module_utils/crypto/cryptography_support.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import binascii diff --git a/plugins/module_utils/crypto/math.py b/plugins/module_utils/crypto/math.py index 010aa6d3..c9afa953 100644 --- a/plugins/module_utils/crypto/math.py +++ b/plugins/module_utils/crypto/math.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import sys diff --git a/plugins/module_utils/crypto/module_backends/certificate.py b/plugins/module_utils/crypto/module_backends/certificate.py index d7920ccd..88e4418e 100644 --- a/plugins/module_utils/crypto/module_backends/certificate.py +++ b/plugins/module_utils/crypto/module_backends/certificate.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import traceback @@ -62,7 +56,7 @@ class CertificateError(OpenSSLObjectError): @six.add_metaclass(abc.ABCMeta) -class CertificateBackend(object): +class CertificateBackend: def __init__(self, module, backend): self.module = module self.backend = backend @@ -329,7 +323,7 @@ class CertificateBackend(object): @six.add_metaclass(abc.ABCMeta) -class CertificateProvider(object): +class CertificateProvider: @abc.abstractmethod def validate_module_args(self, module): """Check module arguments""" diff --git a/plugins/module_utils/crypto/module_backends/certificate_acme.py b/plugins/module_utils/crypto/module_backends/certificate_acme.py index a1d6bf02..2d7ca1e1 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_acme.py +++ b/plugins/module_utils/crypto/module_backends/certificate_acme.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import os import tempfile diff --git a/plugins/module_utils/crypto/module_backends/certificate_entrust.py b/plugins/module_utils/crypto/module_backends/certificate_entrust.py index 737c5b3f..3cc827ec 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_entrust.py +++ b/plugins/module_utils/crypto/module_backends/certificate_entrust.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import datetime import os diff --git a/plugins/module_utils/crypto/module_backends/certificate_info.py b/plugins/module_utils/crypto/module_backends/certificate_info.py index 73709848..6bcb7a8d 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_info.py +++ b/plugins/module_utils/crypto/module_backends/certificate_info.py @@ -1,16 +1,10 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import binascii @@ -63,7 +57,7 @@ TIMESTAMP_FORMAT = "%Y%m%d%H%M%SZ" @six.add_metaclass(abc.ABCMeta) -class CertificateInfoRetrieval(object): +class CertificateInfoRetrieval: def __init__(self, module, backend, content): # content must be a bytes string self.module = module diff --git a/plugins/module_utils/crypto/module_backends/certificate_ownca.py b/plugins/module_utils/crypto/module_backends/certificate_ownca.py index 91f8b7a4..e617b6fb 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_ownca.py +++ b/plugins/module_utils/crypto/module_backends/certificate_ownca.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import os from random import randrange diff --git a/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py b/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py index beeb08b4..1a4589d6 100644 --- a/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py +++ b/plugins/module_utils/crypto/module_backends/certificate_selfsigned.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import os from random import randrange diff --git a/plugins/module_utils/crypto/module_backends/crl_info.py b/plugins/module_utils/crypto/module_backends/crl_info.py index 37dcd6dd..7682e155 100644 --- a/plugins/module_utils/crypto/module_backends/crl_info.py +++ b/plugins/module_utils/crypto/module_backends/crl_info.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import traceback @@ -48,7 +42,7 @@ else: CRYPTOGRAPHY_FOUND = True -class CRLInfoRetrieval(object): +class CRLInfoRetrieval: def __init__(self, module, content, list_revoked_certificates=True): # content must be a bytes string self.module = module diff --git a/plugins/module_utils/crypto/module_backends/csr.py b/plugins/module_utils/crypto/module_backends/csr.py index 5273e042..0a7ef636 100644 --- a/plugins/module_utils/crypto/module_backends/csr.py +++ b/plugins/module_utils/crypto/module_backends/csr.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016, Yanis Guenane # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import binascii @@ -87,7 +81,7 @@ class CertificateSigningRequestError(OpenSSLObjectError): @six.add_metaclass(abc.ABCMeta) -class CertificateSigningRequestBackend(object): +class CertificateSigningRequestBackend: def __init__(self, module, backend): self.module = module self.backend = backend diff --git a/plugins/module_utils/crypto/module_backends/csr_info.py b/plugins/module_utils/crypto/module_backends/csr_info.py index f665aa32..6af0cb10 100644 --- a/plugins/module_utils/crypto/module_backends/csr_info.py +++ b/plugins/module_utils/crypto/module_backends/csr_info.py @@ -1,16 +1,10 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import binascii @@ -55,7 +49,7 @@ TIMESTAMP_FORMAT = "%Y%m%d%H%M%SZ" @six.add_metaclass(abc.ABCMeta) -class CSRInfoRetrieval(object): +class CSRInfoRetrieval: def __init__(self, module, backend, content, validate_signature): # content must be a bytes string self.module = module diff --git a/plugins/module_utils/crypto/module_backends/privatekey.py b/plugins/module_utils/crypto/module_backends/privatekey.py index 2e473f14..1d53e81b 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey.py +++ b/plugins/module_utils/crypto/module_backends/privatekey.py @@ -1,15 +1,9 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016, Yanis Guenane # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import base64 diff --git a/plugins/module_utils/crypto/module_backends/privatekey_convert.py b/plugins/module_utils/crypto/module_backends/privatekey_convert.py index db71d5ef..094880aa 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey_convert.py +++ b/plugins/module_utils/crypto/module_backends/privatekey_convert.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import traceback diff --git a/plugins/module_utils/crypto/module_backends/privatekey_info.py b/plugins/module_utils/crypto/module_backends/privatekey_info.py index a0912102..aa67085f 100644 --- a/plugins/module_utils/crypto/module_backends/privatekey_info.py +++ b/plugins/module_utils/crypto/module_backends/privatekey_info.py @@ -1,16 +1,10 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import traceback @@ -198,7 +192,7 @@ class PrivateKeyParseError(OpenSSLObjectError): @six.add_metaclass(abc.ABCMeta) -class PrivateKeyInfoRetrieval(object): +class PrivateKeyInfoRetrieval: def __init__( self, module, diff --git a/plugins/module_utils/crypto/module_backends/publickey_info.py b/plugins/module_utils/crypto/module_backends/publickey_info.py index 59a31ba2..4b1e2c6d 100644 --- a/plugins/module_utils/crypto/module_backends/publickey_info.py +++ b/plugins/module_utils/crypto/module_backends/publickey_info.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2020-2021, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import traceback @@ -102,7 +96,7 @@ class PublicKeyParseError(OpenSSLObjectError): @six.add_metaclass(abc.ABCMeta) -class PublicKeyInfoRetrieval(object): +class PublicKeyInfoRetrieval: def __init__(self, module, backend, content=None, key=None): # content must be a bytes string self.module = module diff --git a/plugins/module_utils/crypto/openssh.py b/plugins/module_utils/crypto/openssh.py index 6319bdae..de896a4e 100644 --- a/plugins/module_utils/crypto/openssh.py +++ b/plugins/module_utils/crypto/openssh.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2020, Doug Stanley # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations # This import is only to maintain backwards compatibility from ansible_collections.community.crypto.plugins.module_utils.openssh.utils import ( # noqa: F401, pylint: disable=unused-import diff --git a/plugins/module_utils/crypto/pem.py b/plugins/module_utils/crypto/pem.py index e61dbbbc..1d2e8381 100644 --- a/plugins/module_utils/crypto/pem.py +++ b/plugins/module_utils/crypto/pem.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations PEM_START = "-----BEGIN " diff --git a/plugins/module_utils/crypto/support.py b/plugins/module_utils/crypto/support.py index b22935e0..144d5ac8 100644 --- a/plugins/module_utils/crypto/support.py +++ b/plugins/module_utils/crypto/support.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import errno @@ -314,7 +308,7 @@ def select_message_digest(digest_string): @six.add_metaclass(abc.ABCMeta) -class OpenSSLObject(object): +class OpenSSLObject: def __init__(self, path, state, force, check_mode): self.path = path diff --git a/plugins/module_utils/ecs/api.py b/plugins/module_utils/ecs/api.py index b0153dc3..79642e32 100644 --- a/plugins/module_utils/ecs/api.py +++ b/plugins/module_utils/ecs/api.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # This code is part of Ansible, but is an independent component. # This particular file snippet, and this file snippet only, is licensed under the # Modified BSD License. Modules you write using this snippet, which is embedded @@ -10,10 +8,7 @@ # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause) # SPDX-License-Identifier: BSD-2-Clause -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import json import os @@ -101,7 +96,7 @@ def bind(instance, method, operation_spec): return binding_scope_fn -class RestOperation(object): +class RestOperation: def __init__(self, session, uri, method, parameters=None): self.session = session self.method = method @@ -182,7 +177,7 @@ class RestOperation(object): ) -class Resource(object): +class Resource: """Implement basic CRUD operations against a path.""" def __init__(self, session): @@ -229,7 +224,7 @@ class Resource(object): # Session to encapsulate the connection parameters of the module_utils Request object, the api spec, etc -class ECSSession(object): +class ECSSession: def __init__(self, name, **kwargs): """ Initialize our session diff --git a/plugins/module_utils/gnupg/cli.py b/plugins/module_utils/gnupg/cli.py index ca290fcb..31e45a6c 100644 --- a/plugins/module_utils/gnupg/cli.py +++ b/plugins/module_utils/gnupg/cli.py @@ -1,12 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2023, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import abc import os @@ -19,7 +15,7 @@ class GPGError(Exception): @six.add_metaclass(abc.ABCMeta) -class GPGRunner(object): +class GPGRunner: @abc.abstractmethod def run_command(self, command, check_rc=True, data=None): """ diff --git a/plugins/module_utils/io.py b/plugins/module_utils/io.py index 44699f0a..9e676b60 100644 --- a/plugins/module_utils/io.py +++ b/plugins/module_utils/io.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2016, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import errno import os diff --git a/plugins/module_utils/openssh/backends/common.py b/plugins/module_utils/openssh/backends/common.py index 5968d9b5..e82a2302 100644 --- a/plugins/module_utils/openssh/backends/common.py +++ b/plugins/module_utils/openssh/backends/common.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2021, Andrew Pantuso (@ajpantuso) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import abc import os @@ -66,7 +61,7 @@ def _restore_all_on_failure(f): @six.add_metaclass(abc.ABCMeta) -class OpensshModule(object): +class OpensshModule: def __init__(self, module): self.module = module @@ -169,7 +164,7 @@ class OpensshModule(object): self.changed = True -class KeygenCommand(object): +class KeygenCommand: def __init__(self, module): self._bin_path = module.get_bin_path("ssh-keygen", True) self._run_command = module.run_command @@ -187,7 +182,7 @@ class KeygenCommand(object): type, time_parameters, use_agent, - **kwargs + **kwargs, ): args = [self._bin_path, "-s", signing_key_path, "-P", "", "-I", identifier] @@ -269,7 +264,7 @@ class KeygenCommand(object): return self._run_command(command, **kwargs) -class PrivateKey(object): +class PrivateKey: def __init__(self, size, key_type, fingerprint, format=""): self._size = size self._type = key_type @@ -311,7 +306,7 @@ class PrivateKey(object): } -class PublicKey(object): +class PublicKey: def __init__(self, type_string, data, comment): self._type_string = type_string self._data = data diff --git a/plugins/module_utils/openssh/backends/keypair_backend.py b/plugins/module_utils/openssh/backends/keypair_backend.py index 15df0310..b02d2406 100644 --- a/plugins/module_utils/openssh/backends/keypair_backend.py +++ b/plugins/module_utils/openssh/backends/keypair_backend.py @@ -1,14 +1,9 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2018, David Kainz # Copyright (c) 2021, Andrew Pantuso (@ajpantuso) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import abc import os diff --git a/plugins/module_utils/openssh/certificate.py b/plugins/module_utils/openssh/certificate.py index ea64e143..bd7e8f10 100644 --- a/plugins/module_utils/openssh/certificate.py +++ b/plugins/module_utils/openssh/certificate.py @@ -1,26 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2021, Andrew Pantuso (@ajpantuso) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - -# Protocol References -# ------------------- -# https://datatracker.ietf.org/doc/html/rfc4251 -# https://datatracker.ietf.org/doc/html/rfc4253 -# https://datatracker.ietf.org/doc/html/rfc5656 -# https://datatracker.ietf.org/doc/html/rfc8032 -# https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD -# -# Inspired by: -# ------------ -# https://github.com/pyca/cryptography/blob/main/src/cryptography/hazmat/primitives/serialization/ssh.py -# https://github.com/paramiko/paramiko/blob/master/paramiko/message.py +from __future__ import annotations import abc import binascii @@ -46,6 +28,20 @@ from ansible_collections.community.crypto.plugins.module_utils.time import ( ) +# Protocol References +# ------------------- +# https://datatracker.ietf.org/doc/html/rfc4251 +# https://datatracker.ietf.org/doc/html/rfc4253 +# https://datatracker.ietf.org/doc/html/rfc5656 +# https://datatracker.ietf.org/doc/html/rfc8032 +# https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD +# +# Inspired by: +# ------------ +# https://github.com/pyca/cryptography/blob/main/src/cryptography/hazmat/primitives/serialization/ssh.py +# https://github.com/paramiko/paramiko/blob/master/paramiko/message.py + + # See https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD _USER_TYPE = 1 _HOST_TYPE = 2 @@ -107,7 +103,7 @@ if six.PY3: long = int -class OpensshCertificateTimeParameters(object): +class OpensshCertificateTimeParameters: def __init__(self, valid_from, valid_to): self._valid_from = self.to_datetime(valid_from) self._valid_to = self.to_datetime(valid_to) @@ -236,7 +232,7 @@ class OpensshCertificateTimeParameters(object): return result -class OpensshCertificateOption(object): +class OpensshCertificateOption: def __init__(self, option_type, name, data): if option_type not in ("critical", "extension"): raise ValueError("type must be either 'critical' or 'extension'") @@ -493,7 +489,7 @@ class OpensshED25519CertificateInfo(OpensshCertificateInfo): # See https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD -class OpensshCertificate(object): +class OpensshCertificate: """Encapsulates a formatted OpenSSH certificate including signature and signing key""" def __init__(self, cert_info, signature): diff --git a/plugins/module_utils/openssh/cryptography.py b/plugins/module_utils/openssh/cryptography.py index ee66dee8..4460f4ca 100644 --- a/plugins/module_utils/openssh/cryptography.py +++ b/plugins/module_utils/openssh/cryptography.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2021, Andrew Pantuso (@ajpantuso) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import os from base64 import b64decode, b64encode @@ -127,7 +122,7 @@ class InvalidSignatureError(OpenSSHError): pass -class AsymmetricKeypair(object): +class AsymmetricKeypair: """Container for newly generated asymmetric key pairs or those loaded from existing files""" @classmethod @@ -337,7 +332,7 @@ class AsymmetricKeypair(object): return self.__publickey.verify( signature, data, - **_ALGORITHM_PARAMETERS[self.__keytype]["signer_params"] + **_ALGORITHM_PARAMETERS[self.__keytype]["signer_params"], ) except InvalidSignature: raise InvalidSignatureError @@ -354,7 +349,7 @@ class AsymmetricKeypair(object): self.__encryption_algorithm = serialization.NoEncryption() -class OpensshKeypair(object): +class OpensshKeypair: """Container for OpenSSH encoded asymmetric key pairs""" @classmethod diff --git a/plugins/module_utils/openssh/utils.py b/plugins/module_utils/openssh/utils.py index 0e56672f..57c9e56e 100644 --- a/plugins/module_utils/openssh/utils.py +++ b/plugins/module_utils/openssh/utils.py @@ -1,14 +1,9 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2020, Doug Stanley # Copyright (c) 2021, Andrew Pantuso (@ajpantuso) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import os import re @@ -87,7 +82,7 @@ def secure_write(path, mode, content): # See https://datatracker.ietf.org/doc/html/rfc4251#section-5 for SSH data types -class OpensshParser(object): +class OpensshParser: """Parser for OpenSSH encoded objects""" BOOLEAN_OFFSET = 1 @@ -271,7 +266,7 @@ class OpensshParser(object): return result -class _OpensshWriter(object): +class _OpensshWriter: """Writes SSH encoded values to a bytes-like buffer .. warning:: diff --git a/plugins/module_utils/serial.py b/plugins/module_utils/serial.py index 7dce6b12..a3d280aa 100644 --- a/plugins/module_utils/serial.py +++ b/plugins/module_utils/serial.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.crypto.plugins.module_utils.crypto.math import ( diff --git a/plugins/module_utils/time.py b/plugins/module_utils/time.py index e2b0418d..0b4f5fb5 100644 --- a/plugins/module_utils/time.py +++ b/plugins/module_utils/time.py @@ -1,14 +1,8 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import datetime import re diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index 5888d551..6187bcef 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -1,16 +1,10 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2021, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later """Provide version object to compare version numbers.""" -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible.module_utils.compat.version import LooseVersion diff --git a/plugins/modules/acme_account.py b/plugins/modules/acme_account.py index 400cc519..50c697cc 100644 --- a/plugins/modules/acme_account.py +++ b/plugins/modules/acme_account.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_account_info.py b/plugins/modules/acme_account_info.py index 694cca76..a55b966f 100644 --- a/plugins/modules/acme_account_info.py +++ b/plugins/modules/acme_account_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_ari_info.py b/plugins/modules/acme_ari_info.py index 05f17ff2..1860b8a5 100644 --- a/plugins/modules/acme_ari_info.py +++ b/plugins/modules/acme_ari_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_certificate.py b/plugins/modules/acme_certificate.py index 10126b33..a107122a 100644 --- a/plugins/modules/acme_certificate.py +++ b/plugins/modules/acme_certificate.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -600,7 +595,7 @@ from ansible_collections.community.crypto.plugins.module_utils.acme.utils import NO_CHALLENGE = "no challenge" -class ACMECertificateClient(object): +class ACMECertificateClient: """ ACME client class. Uses an ACME account object and a CSR to start and validate ACME challenges and download the respective @@ -1025,7 +1020,7 @@ def main(): challenge_data=data, challenge_data_dns=data_dns, cert_days=client.cert_days, - **other + **other, ) else: module.exit_json(changed=False, cert_days=cert_days) diff --git a/plugins/modules/acme_certificate_deactivate_authz.py b/plugins/modules/acme_certificate_deactivate_authz.py index 5185f255..c3a95988 100644 --- a/plugins/modules/acme_certificate_deactivate_authz.py +++ b/plugins/modules/acme_certificate_deactivate_authz.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_certificate_order_create.py b/plugins/modules/acme_certificate_order_create.py index 22de4fde..73c7cf66 100644 --- a/plugins/modules/acme_certificate_order_create.py +++ b/plugins/modules/acme_certificate_order_create.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2024 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/plugins/modules/acme_certificate_order_finalize.py b/plugins/modules/acme_certificate_order_finalize.py index 5944cd13..0cad2fcb 100644 --- a/plugins/modules/acme_certificate_order_finalize.py +++ b/plugins/modules/acme_certificate_order_finalize.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2024 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ @@ -440,7 +435,7 @@ def main(): changed=changed, account_uri=client.client.account_uri, selected_chain=cert.to_json(), - **other + **other, ) except ModuleFailException as e: e.do_fail(module) diff --git a/plugins/modules/acme_certificate_order_info.py b/plugins/modules/acme_certificate_order_info.py index e04d248b..bde4bd88 100644 --- a/plugins/modules/acme_certificate_order_info.py +++ b/plugins/modules/acme_certificate_order_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2024 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/plugins/modules/acme_certificate_order_validate.py b/plugins/modules/acme_certificate_order_validate.py index 0dcd225b..5ef374b8 100644 --- a/plugins/modules/acme_certificate_order_validate.py +++ b/plugins/modules/acme_certificate_order_validate.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2024 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = """ diff --git a/plugins/modules/acme_certificate_renewal_info.py b/plugins/modules/acme_certificate_renewal_info.py index e414d226..2bc645ac 100644 --- a/plugins/modules/acme_certificate_renewal_info.py +++ b/plugins/modules/acme_certificate_renewal_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_certificate_revoke.py b/plugins/modules/acme_certificate_revoke.py index 01cccfdf..600acba4 100644 --- a/plugins/modules/acme_certificate_revoke.py +++ b/plugins/modules/acme_certificate_revoke.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016 Michael Gruener # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_challenge_cert_helper.py b/plugins/modules/acme_challenge_cert_helper.py index 612a2e74..6ad7ad46 100644 --- a/plugins/modules/acme_challenge_cert_helper.py +++ b/plugins/modules/acme_challenge_cert_helper.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/acme_inspect.py b/plugins/modules/acme_inspect.py index 745aa339..41cb8cd9 100644 --- a/plugins/modules/acme_inspect.py +++ b/plugins/modules/acme_inspect.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018 Felix Fontein (@felixfontein) # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/certificate_complete_chain.py b/plugins/modules/certificate_complete_chain.py index abb946ad..86da1a89 100644 --- a/plugins/modules/certificate_complete_chain.py +++ b/plugins/modules/certificate_complete_chain.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- -# # Copyright (c) 2018, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -164,7 +159,7 @@ except ImportError: HAS_CRYPTOGRAPHY = False -class Certificate(object): +class Certificate: """ Stores PEM with parsed certificate. """ @@ -275,7 +270,7 @@ def load_PEM_list(module, path, fail_on_error=True): return [] -class CertificateSet(object): +class CertificateSet: """ Stores a set of certificates. Allows to search for parent (issuer of a certificate). """ diff --git a/plugins/modules/crypto_info.py b/plugins/modules/crypto_info.py index ac3c1c27..f2f1352b 100644 --- a/plugins/modules/crypto_info.py +++ b/plugins/modules/crypto_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2021 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/ecs_certificate.py b/plugins/modules/ecs_certificate.py index 35337d0f..9424721e 100644 --- a/plugins/modules/ecs_certificate.py +++ b/plugins/modules/ecs_certificate.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c), Entrust Datacard Corporation, 2019 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -627,7 +622,7 @@ def convert_module_param_to_json_bool(module, dict_param_name, param_name): return body -class EcsCertificate(object): +class EcsCertificate: """ Entrust Certificate Services certificate class. """ diff --git a/plugins/modules/ecs_domain.py b/plugins/modules/ecs_domain.py index 6c72dd54..210b243e 100644 --- a/plugins/modules/ecs_domain.py +++ b/plugins/modules/ecs_domain.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright 2019 Entrust Datacard Corporation. # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -242,7 +237,7 @@ def calculate_days_remaining(expiry_date): return days_remaining -class EcsDomain(object): +class EcsDomain: """ Entrust Certificate Services domain class. """ diff --git a/plugins/modules/get_certificate.py b/plugins/modules/get_certificate.py index eb98c235..b3175cf6 100644 --- a/plugins/modules/get_certificate.py +++ b/plugins/modules/get_certificate.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# coding: utf-8 -*- - # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/luks_device.py b/plugins/modules/luks_device.py index ab18e867..407cea42 100644 --- a/plugins/modules/luks_device.py +++ b/plugins/modules/luks_device.py @@ -3,10 +3,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -479,7 +476,7 @@ def wipe_luks_headers(device): f.write(b"\x00\x00\x00\x00\x00\x00") -class Handler(object): +class Handler: def __init__(self, module): self._module = module diff --git a/plugins/modules/openssh_cert.py b/plugins/modules/openssh_cert.py index a65d2568..261102db 100644 --- a/plugins/modules/openssh_cert.py +++ b/plugins/modules/openssh_cert.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018, David Kainz # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssh_keypair.py b/plugins/modules/openssh_keypair.py index 76f978bd..e3b76592 100644 --- a/plugins/modules/openssh_keypair.py +++ b/plugins/modules/openssh_keypair.py @@ -1,15 +1,11 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2018, David Kainz # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function +from __future__ import annotations -__metaclass__ = type - DOCUMENTATION = r""" module: openssh_keypair author: "David Kainz (@lolcube)" diff --git a/plugins/modules/openssl_csr.py b/plugins/modules/openssl_csr.py index c018c91c..8bbe48f1 100644 --- a/plugins/modules/openssl_csr.py +++ b/plugins/modules/openssl_csr.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2017, Yanis Guenane # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_csr_info.py b/plugins/modules/openssl_csr_info.py index ad24715b..573fc54e 100644 --- a/plugins/modules/openssl_csr_info.py +++ b/plugins/modules/openssl_csr_info.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_csr_pipe.py b/plugins/modules/openssl_csr_pipe.py index d7e8673a..9e413839 100644 --- a/plugins/modules/openssl_csr_pipe.py +++ b/plugins/modules/openssl_csr_pipe.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2017, Yanis Guenane # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -142,7 +137,7 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac ) -class CertificateSigningRequestModule(object): +class CertificateSigningRequestModule: def __init__(self, module, module_backend): self.check_mode = module.check_mode self.module = module diff --git a/plugins/modules/openssl_dhparam.py b/plugins/modules/openssl_dhparam.py index 685d6f30..a9076536 100644 --- a/plugins/modules/openssl_dhparam.py +++ b/plugins/modules/openssl_dhparam.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2017, Thom Wiggers # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -175,7 +170,7 @@ class DHParameterError(Exception): pass -class DHParameterBase(object): +class DHParameterBase: def __init__(self, module): self.state = module.params["state"] diff --git a/plugins/modules/openssl_pkcs12.py b/plugins/modules/openssl_pkcs12.py index eecc9de2..59c00d28 100644 --- a/plugins/modules/openssl_pkcs12.py +++ b/plugins/modules/openssl_pkcs12.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2017, Guillaume Delpierre # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_privatekey.py b/plugins/modules/openssl_privatekey.py index 9f696eb7..a2c23adb 100644 --- a/plugins/modules/openssl_privatekey.py +++ b/plugins/modules/openssl_privatekey.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_privatekey_convert.py b/plugins/modules/openssl_privatekey_convert.py index 521858e9..b7d3deff 100644 --- a/plugins/modules/openssl_privatekey_convert.py +++ b/plugins/modules/openssl_privatekey_convert.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2022, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_privatekey_info.py b/plugins/modules/openssl_privatekey_info.py index 9452d205..ea178d03 100644 --- a/plugins/modules/openssl_privatekey_info.py +++ b/plugins/modules/openssl_privatekey_info.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -248,7 +243,7 @@ def main(): except (IOError, OSError) as e: module.fail_json( msg="Error while reading private key file from disk: {0}".format(e), - **result + **result, ) result["can_load_key"] = True diff --git a/plugins/modules/openssl_privatekey_pipe.py b/plugins/modules/openssl_privatekey_pipe.py index b0c97bf2..2d9bfc97 100644 --- a/plugins/modules/openssl_privatekey_pipe.py +++ b/plugins/modules/openssl_privatekey_pipe.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_publickey.py b/plugins/modules/openssl_publickey.py index ee356bdc..119028f8 100644 --- a/plugins/modules/openssl_publickey.py +++ b/plugins/modules/openssl_publickey.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016, Yanis Guenane # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_publickey_info.py b/plugins/modules/openssl_publickey_info.py index dbe205b0..aad5b6f6 100644 --- a/plugins/modules/openssl_publickey_info.py +++ b/plugins/modules/openssl_publickey_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2021, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -196,7 +191,7 @@ def main(): except (IOError, OSError) as e: module.fail_json( msg="Error while reading public key file from disk: {0}".format(e), - **result + **result, ) backend, module_backend = select_backend( diff --git a/plugins/modules/openssl_signature.py b/plugins/modules/openssl_signature.py index c34c736f..98a381c7 100644 --- a/plugins/modules/openssl_signature.py +++ b/plugins/modules/openssl_signature.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2019, Patrick Pichler # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/openssl_signature_info.py b/plugins/modules/openssl_signature_info.py index 15049e27..86981fa3 100644 --- a/plugins/modules/openssl_signature_info.py +++ b/plugins/modules/openssl_signature_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2019, Patrick Pichler # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/x509_certificate.py b/plugins/modules/x509_certificate.py index de4c93ce..63740b9f 100644 --- a/plugins/modules/x509_certificate.py +++ b/plugins/modules/x509_certificate.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/x509_certificate_convert.py b/plugins/modules/x509_certificate_convert.py index 48907eb2..eaf57366 100644 --- a/plugins/modules/x509_certificate_convert.py +++ b/plugins/modules/x509_certificate_convert.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/x509_certificate_info.py b/plugins/modules/x509_certificate_info.py index fde0f5b3..d29ea5a9 100644 --- a/plugins/modules/x509_certificate_info.py +++ b/plugins/modules/x509_certificate_info.py @@ -1,15 +1,10 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/x509_certificate_pipe.py b/plugins/modules/x509_certificate_pipe.py index b31af10c..98c968cb 100644 --- a/plugins/modules/x509_certificate_pipe.py +++ b/plugins/modules/x509_certificate_pipe.py @@ -1,16 +1,11 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2016-2017, Yanis Guenane # Copyright (c) 2017, Markus Teufelberger # Copyright (2) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" @@ -146,7 +141,7 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.module_bac ) -class GenericCertificate(object): +class GenericCertificate: """Retrieve a certificate using the given module backend.""" def __init__(self, module, module_backend): diff --git a/plugins/modules/x509_crl.py b/plugins/modules/x509_crl.py index 094f599c..0d039992 100644 --- a/plugins/modules/x509_crl.py +++ b/plugins/modules/x509_crl.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2019, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/modules/x509_crl_info.py b/plugins/modules/x509_crl_info.py index c8c1de1f..32911abc 100644 --- a/plugins/modules/x509_crl_info.py +++ b/plugins/modules/x509_crl_info.py @@ -1,14 +1,9 @@ #!/usr/bin/python -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations DOCUMENTATION = r""" diff --git a/plugins/plugin_utils/action_module.py b/plugins/plugin_utils/action_module.py index 0fd1cfc3..1b0d8f50 100644 --- a/plugins/plugin_utils/action_module.py +++ b/plugins/plugin_utils/action_module.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Copyright (c) 2012-2013 Michael DeHaan # Copyright (c) 2016 Toshio Kuratomi # Copyright (c) 2019 Ansible Project @@ -12,11 +10,7 @@ # NOTE: THIS IS ONLY FOR ACTION PLUGINS! -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import abc import copy @@ -41,7 +35,7 @@ class _ModuleExitException(Exception): self.result = result -class AnsibleActionModule(object): +class AnsibleActionModule: def __init__( self, action_plugin, diff --git a/plugins/plugin_utils/filter_module.py b/plugins/plugin_utils/filter_module.py index 7177e944..9501590b 100644 --- a/plugins/plugin_utils/filter_module.py +++ b/plugins/plugin_utils/filter_module.py @@ -1,20 +1,15 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2022 Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later # NOTE: THIS IS ONLY FOR FILTER PLUGINS! -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible.errors import AnsibleFilterError -class FilterModuleMock(object): +class FilterModuleMock: def __init__(self, params): self.check_mode = True self.params = params diff --git a/plugins/plugin_utils/gnupg.py b/plugins/plugin_utils/gnupg.py index 55e059a0..7cac6210 100644 --- a/plugins/plugin_utils/gnupg.py +++ b/plugins/plugin_utils/gnupg.py @@ -1,12 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2023, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations from subprocess import PIPE, Popen diff --git a/tests/integration/targets/get_certificate/files/process_certs.py b/tests/integration/targets/get_certificate/files/process_certs.py index 63910431..304d1124 100644 --- a/tests/integration/targets/get_certificate/files/process_certs.py +++ b/tests/integration/targets/get_certificate/files/process_certs.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations from sys import argv from subprocess import Popen, PIPE, STDOUT diff --git a/tests/integration/targets/openssl_signature/filter_plugins/helper.py b/tests/integration/targets/openssl_signature/filter_plugins/helper.py index 684ae6f4..591e386d 100644 --- a/tests/integration/targets/openssl_signature/filter_plugins/helper.py +++ b/tests/integration/targets/openssl_signature/filter_plugins/helper.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations import itertools diff --git a/tests/integration/targets/prepare_jinja2_compat/filter_plugins/ansible_compatibility.py b/tests/integration/targets/prepare_jinja2_compat/filter_plugins/ansible_compatibility.py index c14af4cc..fae4493d 100644 --- a/tests/integration/targets/prepare_jinja2_compat/filter_plugins/ansible_compatibility.py +++ b/tests/integration/targets/prepare_jinja2_compat/filter_plugins/ansible_compatibility.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations # Added in ansible-core 2.11 diff --git a/tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py b/tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py index 6a27dcc4..7dee4c42 100644 --- a/tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py +++ b/tests/integration/targets/prepare_jinja2_compat/filter_plugins/jinja_compatibility.py @@ -36,8 +36,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations from jinja2.filters import contextfilter from jinja2.runtime import Undefined diff --git a/tests/integration/targets/prepare_jinja2_compat/test_plugins/jinja_compatibility.py b/tests/integration/targets/prepare_jinja2_compat/test_plugins/jinja_compatibility.py index 9b1ae919..6384a82c 100644 --- a/tests/integration/targets/prepare_jinja2_compat/test_plugins/jinja_compatibility.py +++ b/tests/integration/targets/prepare_jinja2_compat/test_plugins/jinja_compatibility.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type +from __future__ import annotations def compatibility_equalto_test(a, b): diff --git a/tests/integration/targets/setup_python_info/filter_plugins/version_filter.py b/tests/integration/targets/setup_python_info/filter_plugins/version_filter.py index 2dc98516..8b7f5d75 100644 --- a/tests/integration/targets/setup_python_info/filter_plugins/version_filter.py +++ b/tests/integration/targets/setup_python_info/filter_plugins/version_filter.py @@ -2,8 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function -__metaclass__ = type +from __future__ import annotations def get_major_minor_version(version): @@ -31,7 +30,7 @@ def version_lookup(data, distribution, os_family, distribution_version, distribu return python_version in data -class FilterModule(object): +class FilterModule: """ IP address and network manipulation filters """ def filters(self): diff --git a/tests/unit/plugins/module_utils/acme/backend_data.py b/tests/unit/plugins/module_utils/acme/backend_data.py index e530bd8c..f2ea900e 100644 --- a/tests/unit/plugins/module_utils/acme/backend_data.py +++ b/tests/unit/plugins/module_utils/acme/backend_data.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import base64 import datetime diff --git a/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py b/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py index 1efea750..4ad1a456 100644 --- a/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py +++ b/tests/unit/plugins/module_utils/acme/test_backend_cryptography.py @@ -2,10 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import datetime diff --git a/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py b/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py index 67a9aae7..68b0337d 100644 --- a/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py +++ b/tests/unit/plugins/module_utils/acme/test_backend_openssl_cli.py @@ -2,10 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import datetime diff --git a/tests/unit/plugins/module_utils/acme/test_challenges.py b/tests/unit/plugins/module_utils/acme/test_challenges.py index 6328321c..7a070775 100644 --- a/tests/unit/plugins/module_utils/acme/test_challenges.py +++ b/tests/unit/plugins/module_utils/acme/test_challenges.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.challenges import ( diff --git a/tests/unit/plugins/module_utils/acme/test_errors.py b/tests/unit/plugins/module_utils/acme/test_errors.py index f54ebbfc..f7ada949 100644 --- a/tests/unit/plugins/module_utils/acme/test_errors.py +++ b/tests/unit/plugins/module_utils/acme/test_errors.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.errors import ( diff --git a/tests/unit/plugins/module_utils/acme/test_io.py b/tests/unit/plugins/module_utils/acme/test_io.py index 46c8a317..c5e980c2 100644 --- a/tests/unit/plugins/module_utils/acme/test_io.py +++ b/tests/unit/plugins/module_utils/acme/test_io.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations from ansible_collections.community.crypto.plugins.module_utils.acme.io import ( read_file, diff --git a/tests/unit/plugins/module_utils/acme/test_orders.py b/tests/unit/plugins/module_utils/acme/test_orders.py index 733e7c92..b780c745 100644 --- a/tests/unit/plugins/module_utils/acme/test_orders.py +++ b/tests/unit/plugins/module_utils/acme/test_orders.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.acme.errors import ( diff --git a/tests/unit/plugins/module_utils/acme/test_utils.py b/tests/unit/plugins/module_utils/acme/test_utils.py index dc29bdbd..58dc1a9c 100644 --- a/tests/unit/plugins/module_utils/acme/test_utils.py +++ b/tests/unit/plugins/module_utils/acme/test_utils.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import datetime diff --git a/tests/unit/plugins/module_utils/crypto/test_asn1.py b/tests/unit/plugins/module_utils/crypto/test_asn1.py index 2f4646d9..0d1646f8 100644 --- a/tests/unit/plugins/module_utils/crypto/test_asn1.py +++ b/tests/unit/plugins/module_utils/crypto/test_asn1.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Jordan Borean # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import base64 import re diff --git a/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py b/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py index 7ae9796d..2adf3f7b 100644 --- a/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py +++ b/tests/unit/plugins/module_utils/crypto/test_cryptography_support.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2020, Jordan Borean # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import re diff --git a/tests/unit/plugins/module_utils/crypto/test_math.py b/tests/unit/plugins/module_utils/crypto/test_math.py index d5200c59..35c86a28 100644 --- a/tests/unit/plugins/module_utils/crypto/test_math.py +++ b/tests/unit/plugins/module_utils/crypto/test_math.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2024, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.crypto.math import ( diff --git a/tests/unit/plugins/module_utils/crypto/test_pem.py b/tests/unit/plugins/module_utils/crypto/test_pem.py index 8f7f29b8..eb3ca6cc 100644 --- a/tests/unit/plugins/module_utils/crypto/test_pem.py +++ b/tests/unit/plugins/module_utils/crypto/test_pem.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2023, Felix Fontein # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.crypto.pem import ( diff --git a/tests/unit/plugins/module_utils/openssh/test_certificate.py b/tests/unit/plugins/module_utils/openssh/test_certificate.py index ef0f9591..cf6b1255 100644 --- a/tests/unit/plugins/module_utils/openssh/test_certificate.py +++ b/tests/unit/plugins/module_utils/openssh/test_certificate.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.openssh.certificate import ( diff --git a/tests/unit/plugins/module_utils/openssh/test_cryptography.py b/tests/unit/plugins/module_utils/openssh/test_cryptography.py index 62813388..4a281c90 100644 --- a/tests/unit/plugins/module_utils/openssh/test_cryptography.py +++ b/tests/unit/plugins/module_utils/openssh/test_cryptography.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import os.path from getpass import getuser diff --git a/tests/unit/plugins/module_utils/openssh/test_utils.py b/tests/unit/plugins/module_utils/openssh/test_utils.py index c1b71202..118de444 100644 --- a/tests/unit/plugins/module_utils/openssh/test_utils.py +++ b/tests/unit/plugins/module_utils/openssh/test_utils.py @@ -1,13 +1,8 @@ -# -*- coding: utf-8 -*- - # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.module_utils.openssh.utils import ( diff --git a/tests/unit/plugins/module_utils/test_time.py b/tests/unit/plugins/module_utils/test_time.py index e7a47440..99805e35 100644 --- a/tests/unit/plugins/module_utils/test_time.py +++ b/tests/unit/plugins/module_utils/test_time.py @@ -2,11 +2,7 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - +from __future__ import annotations import datetime import sys diff --git a/tests/unit/plugins/modules/test_luks_device.py b/tests/unit/plugins/modules/test_luks_device.py index 89bcd294..790ce2d4 100644 --- a/tests/unit/plugins/modules/test_luks_device.py +++ b/tests/unit/plugins/modules/test_luks_device.py @@ -2,16 +2,13 @@ # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type +from __future__ import annotations import pytest from ansible_collections.community.crypto.plugins.modules import luks_device -class DummyModule(object): +class DummyModule: # module to mock AnsibleModule class def __init__(self): self.params = dict()