internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-26 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PR #10873/6cd46654 backport][stable-11] Avoid six in plugin code (#10875)

Browse Source 
Avoid six in plugin code (#10873)

Avoid six in plugin code.

(cherry picked from commit 6cd4665412)

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot]
2025-10-05 07:36:47 +02:00
committed by GitHub
parent 3b207ba0fd
commit 1e01aeacb4
34 changed files with 70 additions and 120 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': {

20
tests/sanity/ignore-2.20.txt
View File

@@ -1,19 +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/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
@@ -56,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