ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-26 13:42:49 +00:00
Code Activity

[stable-10] Avoid six in plugin code (#10873) (#10877)

Browse source 
Avoid six in plugin code (#10873)

Avoid six in plugin code.

(cherry picked from commit 6cd4665412)
This commit is contained in:
Felix Fontein 2025-10-05 07:42:27 +02:00 • committed by GitHub
parent 4ab8f79eae
commit 171a028ef8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
37 changed files with 80 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/targets/callback/filter_plugins/helper.py
View file

@ -5,8 +5,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.module_utils.six import string_types
def callback_results_extractor(outputs_results):
results = []
@ -18,7 +16,7 @@ def callback_results_extractor(outputs_results):
line = "line_%s" % (i + 1)
test_line = stdout_lines[i] if i < len(stdout_lines) else None
expected_lines = expected_output[i] if i < len(expected_output) else None
if not isinstance(expected_lines, string_types) and expected_lines is not None:
if not isinstance(expected_lines, str) and expected_lines is not None:
if test_line not in expected_lines:
differences.append({
'line': {

21
tests/sanity/ignore-2.20.txt
View file

@ -1,20 +1,3 @@
plugins/cache/pickle.py pylint:ansible-bad-import-from
plugins/callback/dense.py pylint:ansible-bad-import-from
plugins/callback/elastic.py pylint:ansible-bad-import-from
plugins/callback/opentelemetry.py pylint:ansible-bad-import-from
plugins/filter/from_ini.py pylint:ansible-bad-import-from
plugins/filter/lists_mergeby.py pylint:ansible-bad-import-from
plugins/filter/random_mac.py pylint:ansible-bad-import-from
plugins/filter/to_prettytable.py pylint:ansible-bad-import-from
plugins/filter/unicode_normalize.py pylint:ansible-bad-import-from
plugins/inventory/cobbler.py pylint:ansible-bad-import-from
plugins/inventory/lxd.py pylint:ansible-bad-import-from
plugins/inventory/proxmox.py pylint:ansible-bad-import-from
plugins/inventory/scaleway.py pylint:ansible-bad-import-from
plugins/lookup/dependent.py pylint:ansible-bad-import-from
plugins/lookup/flattened.py pylint:ansible-bad-import-from
plugins/lookup/onepassword.py pylint:ansible-bad-import-from
plugins/lookup/revbitspss.py pylint:ansible-bad-import-from
plugins/module_utils/csv.py pylint:ansible-bad-import-from
plugins/module_utils/gitlab.py pylint:ansible-bad-import-from
plugins/module_utils/homebrew.py pylint:ansible-bad-import-from
@ -57,10 +40,6 @@ plugins/modules/xfconf.py validate-modules:return-syntax-error
plugins/modules/xml.py pylint:ansible-bad-import-from
plugins/modules/zpool_facts.py pylint:ansible-bad-import-from
plugins/modules/zypper_repository.py pylint:ansible-bad-import-from
plugins/plugin_utils/keys_filter.py pylint:ansible-bad-import-from
plugins/plugin_utils/unsafe.py pylint:ansible-bad-import-from
plugins/test/fqdn_valid.py pylint:ansible-bad-import-from
tests/integration/targets/callback/filter_plugins/helper.py pylint:ansible-bad-import-from
tests/unit/plugins/module_utils/identity/keycloak/test_keycloak_connect.py pylint:ansible-bad-import-from
tests/unit/plugins/module_utils/net_tools/pritunl/test_api.py pylint:ansible-bad-import-from
tests/unit/plugins/modules/conftest.py pylint:ansible-bad-import-from

2
tests/unit/plugins/lookup/test_manifold.py
View file

@ -9,12 +9,12 @@ from ansible_collections.community.internal_test_tools.tests.unit.compat import
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, call
from ansible.errors import AnsibleError
from ansible.module_utils.urls import ConnectionError, SSLValidationError
from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
from ansible.module_utils import six
from ansible.plugins.loader import lookup_loader
from ansible_collections.community.general.plugins.lookup.manifold import ManifoldApiClient, ApiError
import json
import os
from urllib.error import HTTPError, URLError
API_FIXTURES = {