mirror of
https://github.com/ansible-collections/community.crypto.git
synced 2026-05-07 13:53:06 +00:00
Get rid of some to_native and to_text calls. (#880)
This commit is contained in:
@@ -40,7 +40,7 @@ _value:
|
||||
"""
|
||||
|
||||
from ansible.errors import AnsibleFilterError
|
||||
from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||
from ansible.module_utils.common.text.converters import to_bytes
|
||||
from ansible_collections.community.crypto.plugins.module_utils.gnupg.cli import (
|
||||
GPGError,
|
||||
get_fingerprint_from_bytes,
|
||||
@@ -59,7 +59,7 @@ def gpg_fingerprint(input):
|
||||
gpg = PluginGPGRunner()
|
||||
return get_fingerprint_from_bytes(gpg, to_bytes(input))
|
||||
except GPGError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -309,7 +309,7 @@ def openssl_csr_info_filter(data, name_encoding="ignore"):
|
||||
module, "cryptography", content=to_bytes(data), validate_signature=True
|
||||
)
|
||||
except OpenSSLObjectError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -147,7 +147,7 @@ _value:
|
||||
"""
|
||||
|
||||
from ansible.errors import AnsibleFilterError
|
||||
from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||
from ansible.module_utils.common.text.converters import to_bytes
|
||||
from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
|
||||
OpenSSLObjectError,
|
||||
)
|
||||
@@ -192,7 +192,7 @@ def openssl_privatekey_info_filter(
|
||||
except PrivateKeyParseError as exc:
|
||||
raise AnsibleFilterError(exc.error_message)
|
||||
except OpenSSLObjectError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -124,7 +124,7 @@ _value:
|
||||
"""
|
||||
|
||||
from ansible.errors import AnsibleFilterError
|
||||
from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||
from ansible.module_utils.common.text.converters import to_bytes
|
||||
from ansible_collections.community.crypto.plugins.module_utils.crypto.basic import (
|
||||
OpenSSLObjectError,
|
||||
)
|
||||
@@ -150,7 +150,7 @@ def openssl_publickey_info_filter(data):
|
||||
except PublicKeyParseError as exc:
|
||||
raise AnsibleFilterError(exc.error_message)
|
||||
except OpenSSLObjectError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -54,7 +54,7 @@ def parse_serial_filter(input):
|
||||
try:
|
||||
return parse_serial(to_native(input))
|
||||
except ValueError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -40,7 +40,6 @@ _value:
|
||||
"""
|
||||
|
||||
from ansible.errors import AnsibleFilterError
|
||||
from ansible.module_utils.common.text.converters import to_native
|
||||
from ansible_collections.community.crypto.plugins.module_utils.serial import to_serial
|
||||
|
||||
|
||||
@@ -56,7 +55,7 @@ def to_serial_filter(input):
|
||||
try:
|
||||
return to_serial(input)
|
||||
except ValueError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -341,7 +341,7 @@ def x509_certificate_info_filter(data, name_encoding="ignore"):
|
||||
try:
|
||||
return get_certificate_info(module, "cryptography", content=to_bytes(data))
|
||||
except OpenSSLObjectError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
@@ -205,7 +205,7 @@ def x509_crl_info_filter(data, name_encoding="ignore", list_revoked_certificates
|
||||
module, content=data, list_revoked_certificates=list_revoked_certificates
|
||||
)
|
||||
except OpenSSLObjectError as exc:
|
||||
raise AnsibleFilterError(to_native(exc))
|
||||
raise AnsibleFilterError(str(exc))
|
||||
|
||||
|
||||
class FilterModule:
|
||||
|
||||
Reference in New Issue
Block a user