internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 21:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
113 changed files with 188 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/modules/homebrew.py
View File

@@ -181,7 +181,6 @@ import re
from ansible_collections.community.general.plugins.module_utils.homebrew import HomebrewValidate
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six import iteritems, string_types
# exceptions -------------------------------------------------------------- {{{
@@ -224,7 +223,7 @@ class Homebrew(object):
return True
else:
return (
isinstance(state, string_types)
isinstance(state, str)
and state.lower() in (
'installed',
'upgraded',
@@ -273,7 +272,7 @@ class Homebrew(object):
raise HomebrewException(self.message)
else:
if isinstance(path, string_types):
if isinstance(path, str):
self._path = path.split(':')
else:
self._path = path
@@ -336,7 +335,7 @@ class Homebrew(object):
def _setup_instance_vars(self, **kwargs):
self.installed_packages = set()
self.outdated_packages = set()
for key, val in iteritems(kwargs):
for key, val in kwargs.items():
setattr(self, key, val)
def _prep(self):
@@ -507,7 +506,7 @@ class Homebrew(object):
'update',
])
if rc == 0:
if out and isinstance(out, string_types):
if out and isinstance(out, str):
already_updated = any(
re.search(r'Already up-to-date.', s.strip(), re.IGNORECASE)
for s in out.split('\n')