Modernize some Python constructs (#876)

* Update __future__ import, remove __metaclass__ assignment.

* Removing obsolete encoding comment.

* Remove unneccessary object inheritance.

plugins/module_utils/crypto/_asn1.py

@@ -1,13 +1,8 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2020, Jordan Borean <jborean93@gmail.com>
 # 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
 

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!

plugins/module_utils/crypto/_objects.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2019, Felix Fontein <felix@fontein.de>
 # 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
 

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 = {

plugins/module_utils/crypto/basic.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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,

plugins/module_utils/crypto/cryptography_crl.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2019, Felix Fontein <felix@fontein.de>
 # 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,

plugins/module_utils/crypto/cryptography_support.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2019, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/math.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2019, Felix Fontein <felix@fontein.de>
 # 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
 

plugins/module_utils/crypto/module_backends/certificate.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # 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"""

plugins/module_utils/crypto/module_backends/certificate_acme.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # 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

plugins/module_utils/crypto/module_backends/certificate_entrust.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # 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

plugins/module_utils/crypto/module_backends/certificate_info.py

@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/certificate_ownca.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # 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

plugins/module_utils/crypto/module_backends/certificate_selfsigned.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # 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

plugins/module_utils/crypto/module_backends/crl_info.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/csr.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/csr_info.py

@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/privatekey.py

@@ -1,15 +1,9 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/privatekey_convert.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2022, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/module_backends/privatekey_info.py

@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016-2017, Yanis Guenane <yanis+ansible@guenane.org>
 # Copyright (c) 2017, Markus Teufelberger <mteufelberger+ansible@mgit.at>
 # Copyright (c) 2020, Felix Fontein <felix@fontein.de>
 # 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,

plugins/module_utils/crypto/module_backends/publickey_info.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2020-2021, Felix Fontein <felix@fontein.de>
 # 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

plugins/module_utils/crypto/openssh.py

@@ -1,13 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2020, Doug Stanley <doug+ansible@technologixllc.com>
 # 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

plugins/module_utils/crypto/pem.py

@@ -1,13 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2019, Felix Fontein <felix@fontein.de>
 # 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 "

plugins/module_utils/crypto/support.py

@@ -1,14 +1,8 @@
-# -*- coding: utf-8 -*-
-#
 # Copyright (c) 2016, Yanis Guenane <yanis+ansible@guenane.org>
 # 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