ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 03:46:55 +00:00
Code Packages Projects Releases Wiki Activity

Remove remaining usages of ansible.module_utils.six. (#1140)

Browse Source
This commit is contained in:
Felix Fontein
2025-10-05 16:17:50 +02:00
committed by GitHub
parent ebe42308cc
commit 251e4eca49
15 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/module_utils/_api/api/client.py
+1 -2
View File
@@ -15,8 +15,7 @@ import logging
import struct
from functools import partial
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 ansible_collections.community.docker.plugins.module_utils._six import PY3, binary_type, iteritems, string_types, raise_from, quote
from .. import auth
from .._import_helper import fail_on_missing_imports
plugins/module_utils/_api/transport/npipeconn.py
+1 -1
View File
@@ -10,7 +10,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.module_utils.six.moves.queue import Empty
from ansible_collections.community.docker.plugins.module_utils._six import Empty
from .. import constants
from .._import_helper import HTTPAdapter, urllib3, urllib3_connection
plugins/module_utils/_api/transport/sshconn.py
+1 -3
View File
@@ -17,9 +17,7 @@ import socket
import subprocess
import traceback
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
from ansible_collections.community.docker.plugins.module_utils._six import PY3, Empty, urlparse
from .basehttpadapter import BaseHTTPAdapter
from .. import constants
plugins/module_utils/_six.py
+10
View File
@@ -47,6 +47,11 @@ if PY3:
def iteritems(d):
return d.items()
from shlex import quote as shlex_quote # pylint: disable=unused-import
from collections.abc import Mapping, Sequence # pylint: disable=unused-import
from queue import Empty # pylint: disable=unused-import
from urllib.parse import quote, urlparse # pylint: disable=unused-import
else:
string_types = (basestring,) # noqa: F821, pylint: disable=undefined-variable
integer_types = (int, long) # noqa: F821, pylint: disable=undefined-variable
@@ -56,6 +61,11 @@ else:
def iteritems(d):
return d.iteritems()
from pipes import quote as shlex_quote
from collections import Mapping, Sequence
from Queue import Empty
from urllib import quote
from urlparse import urlparse
if PY3:
import builtins as _builtins
plugins/module_utils/common.py
+1 -2
View File
@@ -14,8 +14,7 @@ import sys
import traceback
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.six.moves.collections_abc import Mapping, Sequence
from ansible_collections.community.docker.plugins.module_utils._six import string_types
from ansible_collections.community.docker.plugins.module_utils._six import Mapping, Sequence, string_types
from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
plugins/module_utils/common_api.py
+1 -2
View File
@@ -12,8 +12,7 @@ import os
import re
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.six.moves.collections_abc import Mapping, Sequence
from ansible_collections.community.docker.plugins.module_utils._six import string_types
from ansible_collections.community.docker.plugins.module_utils._six import Mapping, Sequence, string_types
from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
plugins/module_utils/compose_v2.py
+1 -2
View File
@@ -17,8 +17,7 @@ from collections import namedtuple
from ansible.module_utils.basic import missing_required_lib
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils._six import string_types
from ansible.module_utils.six.moves import shlex_quote
from ansible_collections.community.docker.plugins.module_utils._six import shlex_quote, string_types
from ansible_collections.community.docker.plugins.module_utils.util import DockerBaseClass
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
plugins/module_utils/util.py
+1 -2
View File
@@ -12,8 +12,7 @@ from datetime import timedelta
from ansible.module_utils.basic import env_fallback
from ansible.module_utils.common.collections import is_sequence
from ansible_collections.community.docker.plugins.module_utils._six import string_types
from ansible.module_utils.six.moves.urllib.parse import urlparse
from ansible_collections.community.docker.plugins.module_utils._six import string_types, urlparse
from ansible.module_utils.common.text.converters import to_text