1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-29 08:27:34 +00:00

Remove all usage of ansible.module_utils.six from main branch (#10888)

* Get rid of all six.moves imports.

* Get rid of iteritems.

* Get rid of *_type(s) aliases.

* Replace StringIO import.

* Get rid of PY2/PY3 constants.

* Get rid of raise_from.

* Get rid of python_2_unicode_compatible.

* Clean up global six imports.

* Remove all usage of ansible.module_utils.six.

* Linting.

* Fix xml module.

* Docs adjustments.
This commit is contained in:
Felix Fontein 2025-10-11 08:21:57 +02:00 committed by GitHub
parent 8f8a0e1d7c
commit a8977afb04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
113 changed files with 188 additions and 352 deletions

View file

@ -15,6 +15,7 @@ import abc
import collections
import json
import traceback
from collections.abc import Mapping
HPE_ONEVIEW_IMP_ERR = None
try:
@ -24,10 +25,8 @@ except ImportError:
HPE_ONEVIEW_IMP_ERR = traceback.format_exc()
HAS_HPE_ONEVIEW = False
from ansible.module_utils import six
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_native
from ansible.module_utils.six.moves.collections_abc import Mapping
def transform_list_to_dict(list_):
@ -128,7 +127,7 @@ class OneViewModuleException(Exception):
self.msg = None
self.oneview_response = None
if isinstance(data, six.string_types):
if isinstance(data, str):
self.msg = data
else:
self.oneview_response = data
@ -178,8 +177,7 @@ class OneViewModuleResourceNotFound(OneViewModuleException):
pass
@six.add_metaclass(abc.ABCMeta)
class OneViewModuleBase(object):
class OneViewModuleBase(object, metaclass=abc.ABCMeta):
MSG_CREATED = 'Resource created successfully.'
MSG_UPDATED = 'Resource updated successfully.'
MSG_DELETED = 'Resource deleted successfully.'