mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-26 13:56:09 -07: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:
parent
8f8a0e1d7c
commit
a8977afb04
113 changed files with 188 additions and 352 deletions
|
|
@ -158,7 +158,6 @@ from ansible_collections.community.general.plugins.module_utils.homebrew import
|
|||
|
||||
from ansible.module_utils.common.text.converters import to_bytes
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.six import iteritems, string_types
|
||||
|
||||
|
||||
# exceptions -------------------------------------------------------------- {{{
|
||||
|
|
@ -201,7 +200,7 @@ class HomebrewCask(object):
|
|||
return True
|
||||
|
||||
return (
|
||||
isinstance(cask, string_types)
|
||||
isinstance(cask, str)
|
||||
and not cls.INVALID_CASK_REGEX.search(cask)
|
||||
)
|
||||
|
||||
|
|
@ -217,7 +216,7 @@ class HomebrewCask(object):
|
|||
return True
|
||||
else:
|
||||
return (
|
||||
isinstance(state, string_types)
|
||||
isinstance(state, str)
|
||||
and state.lower() in (
|
||||
'installed',
|
||||
'absent',
|
||||
|
|
@ -261,7 +260,7 @@ class HomebrewCask(object):
|
|||
raise HomebrewCaskException(self.message)
|
||||
|
||||
else:
|
||||
if isinstance(path, string_types):
|
||||
if isinstance(path, str):
|
||||
self._path = path.split(':')
|
||||
else:
|
||||
self._path = path
|
||||
|
|
@ -348,7 +347,7 @@ class HomebrewCask(object):
|
|||
self.message = ''
|
||||
|
||||
def _setup_instance_vars(self, **kwargs):
|
||||
for key, val in iteritems(kwargs):
|
||||
for key, val in kwargs.items():
|
||||
setattr(self, key, val)
|
||||
|
||||
def _prep(self):
|
||||
|
|
@ -488,7 +487,7 @@ class HomebrewCask(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')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue