From 9a14980ca72ea6b9f3b1c2ddec385728348af1d9 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sun, 26 May 2024 14:13:46 +0200 Subject: [PATCH] [PR #8411/ec886203 backport][stable-9] multiple modules: use new vardict in module (#8419) multiple modules: use new vardict in module (#8411) * use new vardict in module * add changelog frag * Update changelogs/fragments/8411-locale-gen-vardict.yml Co-authored-by: Felix Fontein * set use_old_vardict to false in snap * set use_old_vardict to false in cpanm * set use_old_vardict to false in django mod helper * set use_old_vardict to false in gconftool2_info * set use_old_vardict to false in kernel_blacklist * set use_old_vardict to false in mksysb * set use_old_vardict to false in pipx_info * set use_old_vardict to false in snap_alias * update chglog frag * fix typo --------- Co-authored-by: Felix Fontein (cherry picked from commit ec886203fc5d7805fe867188084664e607d503b5) Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com> --- changelogs/fragments/8411-locale-gen-vardict.yml | 11 +++++++++++ plugins/module_utils/django.py | 1 + plugins/module_utils/vardict.py | 2 +- plugins/modules/cpanm.py | 1 + plugins/modules/gconftool2_info.py | 1 + plugins/modules/hponcfg.py | 1 + plugins/modules/kernel_blacklist.py | 2 +- plugins/modules/locale_gen.py | 1 + plugins/modules/mksysb.py | 1 + plugins/modules/pipx_info.py | 1 + plugins/modules/snap.py | 5 +++-- plugins/modules/snap_alias.py | 1 + 12 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/8411-locale-gen-vardict.yml diff --git a/changelogs/fragments/8411-locale-gen-vardict.yml b/changelogs/fragments/8411-locale-gen-vardict.yml new file mode 100644 index 0000000000..5220731281 --- /dev/null +++ b/changelogs/fragments/8411-locale-gen-vardict.yml @@ -0,0 +1,11 @@ +bugfixes: + - django module utils - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - cpanm - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - gconftool2_info - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - hponcfg - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - kernel_blacklist - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - locale_gen - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - mksysb - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - pipx_info - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - snap - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). + - snap_alias - use new ``VarDict`` to prevent deprecation warning (https://github.com/ansible-collections/community.general/issues/8410, https://github.com/ansible-collections/community.general/pull/8411). diff --git a/plugins/module_utils/django.py b/plugins/module_utils/django.py index b93dabbd2c..fbaf840db2 100644 --- a/plugins/module_utils/django.py +++ b/plugins/module_utils/django.py @@ -54,6 +54,7 @@ class DjangoModuleHelper(ModuleHelper): django_admin_cmd = None arg_formats = {} django_admin_arg_order = () + use_old_vardict = False def __init__(self): argument_spec = dict(django_std_args) diff --git a/plugins/module_utils/vardict.py b/plugins/module_utils/vardict.py index cfcce4d4d2..51f802483d 100644 --- a/plugins/module_utils/vardict.py +++ b/plugins/module_utils/vardict.py @@ -100,7 +100,7 @@ class _Variable(object): return def __str__(self): - return "<_Variable: value={0!r}, initial={1!r}, diff={2}, output={3}, change={4}, verbosity={5}>".format( + return "".format( self.value, self.initial_value, self.diff, self.output, self.change, self.verbosity ) diff --git a/plugins/modules/cpanm.py b/plugins/modules/cpanm.py index 302f995932..3beae895dc 100644 --- a/plugins/modules/cpanm.py +++ b/plugins/modules/cpanm.py @@ -170,6 +170,7 @@ class CPANMinus(ModuleHelper): installdeps=cmd_runner_fmt.as_bool("--installdeps"), pkg_spec=cmd_runner_fmt.as_list(), ) + use_old_vardict = False def __init_module__(self): v = self.vars diff --git a/plugins/modules/gconftool2_info.py b/plugins/modules/gconftool2_info.py index 282065b95e..f66e2da8f7 100644 --- a/plugins/modules/gconftool2_info.py +++ b/plugins/modules/gconftool2_info.py @@ -60,6 +60,7 @@ class GConftoolInfo(ModuleHelper): ), supports_check_mode=True, ) + use_old_vardict = False def __init_module__(self): self.runner = gconftool2_runner(self.module, check_rc=True) diff --git a/plugins/modules/hponcfg.py b/plugins/modules/hponcfg.py index 612a20d923..206565a235 100644 --- a/plugins/modules/hponcfg.py +++ b/plugins/modules/hponcfg.py @@ -98,6 +98,7 @@ class HPOnCfg(ModuleHelper): verbose=cmd_runner_fmt.as_bool("-v"), minfw=cmd_runner_fmt.as_opt_val("-m"), ) + use_old_vardict = False def __run__(self): runner = CmdRunner( diff --git a/plugins/modules/kernel_blacklist.py b/plugins/modules/kernel_blacklist.py index 2a281440a7..224b5bba8c 100644 --- a/plugins/modules/kernel_blacklist.py +++ b/plugins/modules/kernel_blacklist.py @@ -67,7 +67,7 @@ class Blacklist(StateModuleHelper): ), supports_check_mode=True, ) - mute_vardict_deprecation = True + use_old_vardict = False def __init_module__(self): self.pattern = re.compile(r'^blacklist\s+{0}$'.format(re.escape(self.vars.name))) diff --git a/plugins/modules/locale_gen.py b/plugins/modules/locale_gen.py index 0dd76c9ab4..fe501e0239 100644 --- a/plugins/modules/locale_gen.py +++ b/plugins/modules/locale_gen.py @@ -79,6 +79,7 @@ class LocaleGen(StateModuleHelper): ), supports_check_mode=True, ) + use_old_vardict = False def __init_module__(self): self.vars.set("ubuntu_mode", False) diff --git a/plugins/modules/mksysb.py b/plugins/modules/mksysb.py index 8272dbf7de..1280f04d59 100644 --- a/plugins/modules/mksysb.py +++ b/plugins/modules/mksysb.py @@ -138,6 +138,7 @@ class MkSysB(ModuleHelper): backup_dmapi_fs=cmd_runner_fmt.as_bool("-A"), combined_path=cmd_runner_fmt.as_func(cmd_runner_fmt.unpack_args(lambda p, n: ["%s/%s" % (p, n)])), ) + use_old_vardict = False def __init_module__(self): if not os.path.isdir(self.vars.storage_path): diff --git a/plugins/modules/pipx_info.py b/plugins/modules/pipx_info.py index 34f9681b06..992ca79419 100644 --- a/plugins/modules/pipx_info.py +++ b/plugins/modules/pipx_info.py @@ -150,6 +150,7 @@ class PipXInfo(ModuleHelper): ), supports_check_mode=True, ) + use_old_vardict = False def __init_module__(self): if self.vars.executable: diff --git a/plugins/modules/snap.py b/plugins/modules/snap.py index fd16764802..16c3aec48b 100644 --- a/plugins/modules/snap.py +++ b/plugins/modules/snap.py @@ -194,6 +194,7 @@ class Snap(StateModuleHelper): }, supports_check_mode=True, ) + use_old_vardict = False @staticmethod def _first_non_zero(a): @@ -405,8 +406,8 @@ class Snap(StateModuleHelper): def state_present(self): - self.vars.meta('classic').set(output=True) - self.vars.meta('channel').set(output=True) + self.vars.set_meta('classic', output=True) + self.vars.set_meta('channel', output=True) actionable_refresh = [snap for snap in self.vars.name if self.vars.snap_status_map[snap] == Snap.CHANNEL_MISMATCH] if actionable_refresh: diff --git a/plugins/modules/snap_alias.py b/plugins/modules/snap_alias.py index 54448c6f3a..ba54a9e155 100644 --- a/plugins/modules/snap_alias.py +++ b/plugins/modules/snap_alias.py @@ -105,6 +105,7 @@ class SnapAlias(StateModuleHelper): ], supports_check_mode=True, ) + use_old_vardict = False def _aliases(self): n = self.vars.name