mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 21:32:49 +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:
@@ -13,7 +13,6 @@ import json
|
||||
import pytest
|
||||
|
||||
from .FakeAnsibleModule import FakeAnsibleModule
|
||||
from ansible.module_utils import six
|
||||
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import MagicMock
|
||||
|
||||
|
||||
@@ -98,7 +97,7 @@ def fixture_data_from_file(request):
|
||||
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
|
||||
fixture_data = {}
|
||||
|
||||
if isinstance(request.param, six.string_types):
|
||||
if isinstance(request.param, str):
|
||||
request.param = [request.param]
|
||||
|
||||
for fixture_name in request.param:
|
||||
|
||||
Reference in New Issue
Block a user