Merge pull request #33 from RanabirChakraborty/AMW-441

AMW-441 common collection CI jobs are failing due to some python module

Author: RanabirChakraborty

plugins/module_utils/version.py

@@ -9,14 +9,11 @@
 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:
     try:
         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

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)