1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-14 07:55:05 +00:00

[PR #11229/f2783967 backport][stable-12] fix couple of f-string mishaps (#11230)

fix couple of f-string mishaps (#11229)

* fix couple of f-string mishaps

* add changelog frag

* fix insanity

(cherry picked from commit f27839673c)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2025-11-30 08:38:34 +01:00 committed by GitHub
parent cdfc73b059
commit fb00ba1b0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions

View file

@ -0,0 +1,4 @@
bugfixes:
- pam_limits - remove ``%`` templating no longer used in f-string (https://github.com/ansible-collections/community.general/pull/11229).
minor_changes:
- spectrum_model_attrs - convert ``%`` templating to f-string (https://github.com/ansible-collections/community.general/pull/11229).

View file

@ -158,7 +158,7 @@ def _assert_is_valid_value(module, item, value, prefix=""):
module.fail_json(
msg=f"{prefix} Value of {value!r} for item {item!r} is invalid. Value must either be 'unlimited', 'infinity' or -1, all of "
"which indicate no limit, or a limit of 0 or larger. Refer to the limits.conf(5) manual pages for "
"more details." % (prefix, value, item)
"more details."
)

View file

@ -348,7 +348,7 @@ class spectrum_model_attrs:
rqstd_attrs = ""
for ra in ret_attrs:
_id = self.attr_id(ra) or ra
rqstd_attrs += '<rs:requested-attribute id="%s" />' % (self.attr_id(ra) or ra)
rqstd_attrs = f'{rqstd_attrs}<rs:requested-attribute id="{_id}" />'
# Build the complete XML search query for HTTP POST.
xml = f"""<?xml version="1.0" encoding="UTF-8"?>

View file

@ -583,7 +583,6 @@ def split_xpath_last(xpath):
def nsnameToClark(name, namespaces):
if ":" in name:
(nsname, rawname) = name.split(":")
# return "{{%s}}%s" % (namespaces[nsname], rawname)
return f"{{{namespaces[nsname]}}}{rawname}"
# no namespace name here