From ac0159025d94060e1bc5cefe0d846743a83cf07a Mon Sep 17 00:00:00 2001 From: Ranabir Chakraborty Date: Sat, 4 Oct 2025 23:39:04 +0530 Subject: [PATCH] AMW-441 common collection CI jobs are failing due to some python module --- plugins/module_utils/version.py | 5 +---- plugins/modules/xml.py | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index 3699881..505fa8f 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -9,9 +9,6 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type - -from ansible.module_utils.six import raise_from - try: from ansible.module_utils.compat.version import LooseVersion # noqa: F401, pylint: disable=unused-import except ImportError: @@ -19,4 +16,4 @@ from distutils.version import LooseVersion # noqa: F401, pylint: disable=unused-import except ImportError as exc: msg = 'To use this plugin or module with ansible-core 2.11, you need to use Python < 3.12 with distutils.version present' - raise_from(ImportError(msg), exc) + raise ImportError(msg) from exc diff --git a/plugins/modules/xml.py b/plugins/modules/xml.py index 098c1eb..0099383 100644 --- a/plugins/modules/xml.py +++ b/plugins/modules/xml.py @@ -379,7 +379,6 @@ HAS_LXML = False from ansible.module_utils.basic import AnsibleModule, json_dict_bytes_to_unicode, missing_required_lib -from ansible.module_utils.six import iteritems, string_types from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.common._collections_compat import MutableMapping @@ -760,13 +759,13 @@ def child_to_element(module, child, in_type): except etree.XMLSyntaxError as e: module.fail_json(msg="Error while parsing child element: %s" % e) elif in_type == 'yaml': - if isinstance(child, string_types): + if isinstance(child, str): return etree.Element(child) elif isinstance(child, MutableMapping): if len(child) > 1: module.fail_json(msg="Can only create children from hashes with one key") - (key, value) = next(iteritems(child)) + (key, value) = next(iter(child.items())) if isinstance(value, MutableMapping): children = value.pop('_', None)