internet/community.crypto
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.crypto.git synced 2026-05-06 13:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace % and str.format() with f-strings (#875)

Browse Source 
* Replace % and str.format() with f-strings.

* Apply suggestions from review.
This commit is contained in:
Felix Fontein
2025-05-01 11:50:10 +02:00
committed by GitHub
parent d8f838c365
commit 641e63b08c
86 changed files with 544 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/filter/gpg_fingerprint.py
View File

@@ -54,9 +54,7 @@ from ansible_collections.community.crypto.plugins.plugin_utils.gnupg import (
def gpg_fingerprint(input):
if not isinstance(input, string_types):
raise AnsibleFilterError(
"The input for the community.crypto.gpg_fingerprint filter must be a string; got {type} instead".format(
type=type(input)
)
f"The input for the community.crypto.gpg_fingerprint filter must be a string; got {type(input)} instead"
)
try:
gpg = PluginGPGRunner()

9
plugins/filter/openssl_csr_info.py
View File

@@ -292,19 +292,16 @@ def openssl_csr_info_filter(data, name_encoding="ignore"):
"""Extract information from X.509 PEM certificate."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.openssl_csr_info input must be a text type, not %s"
% type(data)
f"The community.crypto.openssl_csr_info input must be a text type, not {type(data)}"
)
if not isinstance(name_encoding, string_types):
raise AnsibleFilterError(
"The name_encoding option must be of a text type, not %s"
% type(name_encoding)
f"The name_encoding option must be of a text type, not {type(name_encoding)}"
)
name_encoding = to_native(name_encoding)
if name_encoding not in ("ignore", "idna", "unicode"):
raise AnsibleFilterError(
'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "%s"'
% name_encoding
f'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "{name_encoding}"'
)
module = FilterModuleMock({"name_encoding": name_encoding})

8
plugins/filter/openssl_privatekey_info.py
View File

@@ -167,17 +167,15 @@ def openssl_privatekey_info_filter(
"""Extract information from X.509 PEM certificate."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.openssl_privatekey_info input must be a text type, not %s"
% type(data)
f"The community.crypto.openssl_privatekey_info input must be a text type, not {type(data)}"
)
if passphrase is not None and not isinstance(passphrase, string_types):
raise AnsibleFilterError(
"The passphrase option must be a text type, not %s" % type(passphrase)
f"The passphrase option must be a text type, not {type(passphrase)}"
)
if not isinstance(return_private_key_data, bool):
raise AnsibleFilterError(
"The return_private_key_data option must be a boolean, not %s"
% type(return_private_key_data)
f"The return_private_key_data option must be a boolean, not {type(return_private_key_data)}"
)
module = FilterModuleMock({})

3
plugins/filter/openssl_publickey_info.py
View File

@@ -142,8 +142,7 @@ def openssl_publickey_info_filter(data):
"""Extract information from OpenSSL PEM public key."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.openssl_publickey_info input must be a text type, not %s"
% type(data)
f"The community.crypto.openssl_publickey_info input must be a text type, not {type(data)}"
)
module = FilterModuleMock({})

4
plugins/filter/parse_serial.py
View File

@@ -50,9 +50,7 @@ from ansible_collections.community.crypto.plugins.module_utils.serial import (
def parse_serial_filter(input):
if not isinstance(input, string_types):
raise AnsibleFilterError(
"The input for the community.crypto.parse_serial filter must be a string; got {type} instead".format(
type=type(input)
)
f"The input for the community.crypto.parse_serial filter must be a string; got {type(input)} instead"
)
try:
return parse_serial(to_native(input))

3
plugins/filter/split_pem.py
View File

@@ -50,8 +50,7 @@ def split_pem_filter(data):
"""Split PEM file."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.split_pem input must be a text type, not %s"
% type(data)
f"The community.crypto.split_pem input must be a text type, not {type(data)}"
)
data = to_text(data)

4
plugins/filter/to_serial.py
View File

@@ -48,9 +48,7 @@ from ansible_collections.community.crypto.plugins.module_utils.serial import to_
def to_serial_filter(input):
if not isinstance(input, integer_types):
raise AnsibleFilterError(
"The input for the community.crypto.to_serial filter must be an integer; got {type} instead".format(
type=type(input)
)
f"The input for the community.crypto.to_serial filter must be an integer; got {type(input)} instead"
)
if input < 0:
raise AnsibleFilterError(

9
plugins/filter/x509_certificate_info.py
View File

@@ -326,19 +326,16 @@ def x509_certificate_info_filter(data, name_encoding="ignore"):
"""Extract information from X.509 PEM certificate."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.x509_certificate_info input must be a text type, not %s"
% type(data)
f"The community.crypto.x509_certificate_info input must be a text type, not {type(data)}"
)
if not isinstance(name_encoding, string_types):
raise AnsibleFilterError(
"The name_encoding option must be of a text type, not %s"
% type(name_encoding)
f"The name_encoding option must be of a text type, not {type(name_encoding)}"
)
name_encoding = to_native(name_encoding)
if name_encoding not in ("ignore", "idna", "unicode"):
raise AnsibleFilterError(
'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "%s"'
% name_encoding
f'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "{name_encoding}"'
)
module = FilterModuleMock({"name_encoding": name_encoding})

12
plugins/filter/x509_crl_info.py
View File

@@ -177,24 +177,20 @@ def x509_crl_info_filter(data, name_encoding="ignore", list_revoked_certificates
"""Extract information from X.509 PEM certificate."""
if not isinstance(data, string_types):
raise AnsibleFilterError(
"The community.crypto.x509_crl_info input must be a text type, not %s"
% type(data)
f"The community.crypto.x509_crl_info input must be a text type, not {type(data)}"
)
if not isinstance(name_encoding, string_types):
raise AnsibleFilterError(
"The name_encoding option must be of a text type, not %s"
% type(name_encoding)
f"The name_encoding option must be of a text type, not {type(name_encoding)}"
)
if not isinstance(list_revoked_certificates, bool):
raise AnsibleFilterError(
"The list_revoked_certificates option must be a boolean, not %s"
% type(list_revoked_certificates)
f"The list_revoked_certificates option must be a boolean, not {type(list_revoked_certificates)}"
)
name_encoding = to_native(name_encoding)
if name_encoding not in ("ignore", "idna", "unicode"):
raise AnsibleFilterError(
'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "%s"'
% name_encoding
f'The name_encoding option must be one of the values "ignore", "idna", or "unicode", not "{name_encoding}"'
)
data = to_bytes(data)