Replace ansible.module_utils.six with own module utils in some cases (#1138)

* Replace ansible.module_utils.six with own module utils in some cases.

* Add ignore.txt entires.
This commit is contained in:
Felix Fontein
2025-10-04 23:45:27 +02:00
committed by GitHub
parent 82b49c7cf2
commit ebe42308cc
43 changed files with 149 additions and 70 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ __metaclass__ = type
import traceback
from ansible.module_utils.six import PY2
from ansible_collections.community.docker.plugins.module_utils._six import PY2
REQUESTS_IMPORT_ERROR = None
+1 -1
View File
@@ -15,7 +15,7 @@ import logging
import struct
from functools import partial
from ansible.module_utils.six import PY3, binary_type, iteritems, string_types, raise_from
from ansible_collections.community.docker.plugins.module_utils._six import PY3, binary_type, iteritems, string_types, raise_from
from ansible.module_utils.six.moves.urllib.parse import quote
from .. import auth
+1 -1
View File
@@ -14,7 +14,7 @@ import base64
import json
import logging
from ansible.module_utils.six import iteritems, string_types
from ansible_collections.community.docker.plugins.module_utils._six import iteritems, string_types
from . import errors
from .credentials.store import Store
+1 -1
View File
@@ -13,7 +13,7 @@ __metaclass__ = type
import json
import os
from ansible.module_utils.six import raise_from
from ansible_collections.community.docker.plugins.module_utils._six import raise_from
from .. import errors
+1 -1
View File
@@ -14,7 +14,7 @@ import json
import os
from shutil import copyfile, rmtree
from ansible.module_utils.six import raise_from
from ansible_collections.community.docker.plugins.module_utils._six import raise_from
from ..errors import ContextException
from ..tls import TLSConfig
@@ -14,7 +14,7 @@ import errno
import json
import subprocess
from ansible.module_utils.six import PY3, binary_type
from ansible_collections.community.docker.plugins.module_utils._six import PY3, binary_type
from . import constants
from . import errors
@@ -13,7 +13,7 @@ __metaclass__ = type
import os
import sys
from ansible.module_utils.six import PY2
from ansible_collections.community.docker.plugins.module_utils._six import PY2
if PY2:
from distutils.spawn import find_executable as which
+1 -1
View File
@@ -13,7 +13,7 @@ __metaclass__ = type
from ._import_helper import HTTPError as _HTTPError
from ansible.module_utils.common.text.converters import to_native
from ansible.module_utils.six import raise_from
from ansible_collections.community.docker.plugins.module_utils._six import raise_from
class DockerException(Exception):
@@ -15,7 +15,7 @@ import io
import time
import traceback
from ansible.module_utils.six import PY2
from ansible_collections.community.docker.plugins.module_utils._six import PY2
PYWIN32_IMPORT_ERROR = None
try:
@@ -17,7 +17,7 @@ import socket
import subprocess
import traceback
from ansible.module_utils.six import PY3
from ansible_collections.community.docker.plugins.module_utils._six import PY3
from ansible.module_utils.six.moves.queue import Empty
from ansible.module_utils.six.moves.urllib_parse import urlparse
@@ -12,7 +12,7 @@ __metaclass__ = type
import socket
from ansible.module_utils.six import PY2
from ansible_collections.community.docker.plugins.module_utils._six import PY2
from .basehttpadapter import BaseHTTPAdapter
from .. import constants
+1 -1
View File
@@ -17,7 +17,7 @@ import re
import tarfile
import tempfile
from ansible.module_utils.six import PY3
from ansible_collections.community.docker.plugins.module_utils._six import PY3
from . import fnmatch
from ..constants import IS_WINDOWS_PLATFORM, WINDOWS_LONGPATH_PREFIX
@@ -13,7 +13,7 @@ __metaclass__ = type
import json
import json.decoder
from ansible.module_utils.six import text_type
from ansible_collections.community.docker.plugins.module_utils._six import text_type
from ..errors import StreamParseError
+1 -1
View File
@@ -16,7 +16,7 @@ import select
import socket as pysocket
import struct
from ansible.module_utils.six import PY3, binary_type
from ansible_collections.community.docker.plugins.module_utils._six import PY3, binary_type
from ..transport.npipesocket import NpipeSocket
+1 -1
View File
@@ -19,7 +19,7 @@ import shlex
import string
from ansible_collections.community.docker.plugins.module_utils.version import StrictVersion
from ansible.module_utils.six import PY2, PY3, binary_type, integer_types, iteritems, string_types, text_type
from ansible_collections.community.docker.plugins.module_utils._six import PY2, PY3, binary_type, integer_types, iteritems, string_types, text_type
from .. import errors
from ..constants import DEFAULT_HTTP_HOST