From 9a4e77384d9ec8837bd1308589075571aef2ce38 Mon Sep 17 00:00:00 2001 From: Alexei Znamensky <103110+russoz@users.noreply.github.com> Date: Wed, 3 May 2023 06:48:46 +1200 Subject: [PATCH] ModuleHelper: updated/fixed imports in module_utils/module_helper.py (#6464) * ModuleHelper: updated/fixed imports in module_utils/module_helper.py * add changelog frag * pylint disable unused imports * now in the right file --- changelogs/fragments/6464-mh-imports.yml | 2 ++ plugins/module_utils/mh/module_helper.py | 1 + plugins/module_utils/module_helper.py | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/6464-mh-imports.yml diff --git a/changelogs/fragments/6464-mh-imports.yml b/changelogs/fragments/6464-mh-imports.yml new file mode 100644 index 0000000000..7651dca1da --- /dev/null +++ b/changelogs/fragments/6464-mh-imports.yml @@ -0,0 +1,2 @@ +minor_changes: + - module_helper module utils - updated the imports to make more MH features available at ``plugins/module_utils/module_helper.py`` (https://github.com/ansible-collections/community.general/pull/6464). diff --git a/plugins/module_utils/mh/module_helper.py b/plugins/module_utils/mh/module_helper.py index c5973262d2..3cf16a6018 100644 --- a/plugins/module_utils/mh/module_helper.py +++ b/plugins/module_utils/mh/module_helper.py @@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type + from ansible.module_utils.common.dict_transformations import dict_merge # (TODO: remove AnsibleModule!) pylint: disable-next=unused-import diff --git a/plugins/module_utils/module_helper.py b/plugins/module_utils/module_helper.py index 8a51de6658..195bf270dd 100644 --- a/plugins/module_utils/module_helper.py +++ b/plugins/module_utils/module_helper.py @@ -7,14 +7,17 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type +# pylint: disable=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ( # noqa: F401, pylint: disable=unused-import + +from ansible_collections.community.general.plugins.module_utils.mh.module_helper import ( ModuleHelper, StateModuleHelper, CmdModuleHelper, CmdStateModuleHelper, AnsibleModule ) -from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr # noqa: F401, pylint: disable=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException # noqa: F401, pylint: disable=unused-import -# pylint: disable-next=unused-import -from ansible_collections.community.general.plugins.module_utils.mh.deco import cause_changes, module_fails_on_exception # noqa: F401 -from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict # noqa: F401, pylint: disable=unused-import +from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd import CmdMixin, ArgFormat # noqa: F401 +from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin # noqa: F401 +from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyCtxMgr, DependencyMixin # noqa: F401 +from ansible_collections.community.general.plugins.module_utils.mh.exceptions import ModuleHelperException # noqa: F401 +from ansible_collections.community.general.plugins.module_utils.mh.deco import ( + cause_changes, module_fails_on_exception, check_mode_skip, check_mode_skip_returns, +) +from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarMeta, VarDict, VarsMixin # noqa: F401