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
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

@ -7,7 +7,6 @@ from __future__ import annotations
import os
import re
from ansible.module_utils.six import string_types
def _create_regex_group_complement(s):
@ -70,7 +69,7 @@ class HomebrewValidate(object):
- os.path.sep
"""
if isinstance(path, string_types):
if isinstance(path, str):
return not cls.INVALID_PATH_REGEX.search(path)
try:
@ -98,7 +97,7 @@ class HomebrewValidate(object):
return True
return isinstance(
brew_path, string_types
brew_path, str
) and not cls.INVALID_BREW_PATH_REGEX.search(brew_path)
@classmethod
@ -109,7 +108,7 @@ class HomebrewValidate(object):
return True
return isinstance(
package, string_types
package, str
) and not cls.INVALID_PACKAGE_REGEX.search(package)
@ -126,7 +125,7 @@ def parse_brew_path(module):
if not HomebrewValidate.valid_path(path):
module.fail_json(msg="Invalid path: {0}".format(path))
if isinstance(path, string_types):
if isinstance(path, str):
paths = path.split(":")
elif isinstance(path, list):
paths = path