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

changelogs/fragments/1139-six.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "Avoid remaining usages of deprecated ``ansible.module_utils.six`` (https://github.com/ansible-collections/community.docker/pull/1133)."

plugins/module_utils/_api/api/client.py

@@ -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_collections.community.docker.plugins.module_utils._six import PY3, binary_type, iteritems, string_types, raise_from, quote
-from ansible.module_utils.six.moves.urllib.parse import quote
 
 from .. import auth
 from .._import_helper import fail_on_missing_imports

plugins/module_utils/_api/transport/npipeconn.py

@@ -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

@@ -17,9 +17,7 @@ import socket
 import subprocess
 import traceback
 
-from ansible_collections.community.docker.plugins.module_utils._six import PY3
+from ansible_collections.community.docker.plugins.module_utils._six import PY3, Empty, urlparse
-from ansible.module_utils.six.moves.queue import Empty
-from ansible.module_utils.six.moves.urllib_parse import urlparse
 
 from .basehttpadapter import BaseHTTPAdapter
 from .. import constants

plugins/module_utils/_six.py

@@ -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

@@ -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 Mapping, Sequence, string_types
-from ansible_collections.community.docker.plugins.module_utils._six import 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

@@ -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 Mapping, Sequence, string_types
-from ansible_collections.community.docker.plugins.module_utils._six import 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

@@ -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_collections.community.docker.plugins.module_utils._six import shlex_quote, string_types
-from ansible.module_utils.six.moves import shlex_quote
 
 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

@@ -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_collections.community.docker.plugins.module_utils._six import string_types, urlparse
-from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ansible.module_utils.common.text.converters import to_text
 
 

tests/sanity/ignore-2.15.txt

@@ -6,3 +6,5 @@ plugins/modules/docker_container_copy_into.py validate-modules:invalid-documenta
 plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/modules/docker_image_build.py validate-modules:invalid-documentation
 plugins/module_utils/_six.py no-dict-iteritems
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
+plugins/module_utils/_six.py pylint:deprecated-class

tests/sanity/ignore-2.16.txt

@@ -5,3 +5,5 @@ plugins/modules/docker_container_copy_into.py validate-modules:invalid-documenta
 plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/modules/docker_image_build.py validate-modules:invalid-documentation
 plugins/module_utils/_six.py no-dict-iteritems
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
+plugins/module_utils/_six.py pylint:deprecated-class

tests/sanity/ignore-2.17.txt

@@ -1,4 +1,6 @@
 plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/module_utils/_api/api/client.py pylint:use-yield-from  # suggested construct does not work with Python 2
 plugins/module_utils/_api/utils/build.py pylint:use-yield-from  # suggested construct does not work with Python 2
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
+plugins/module_utils/_six.py pylint:deprecated-class
 tests/unit/plugins/module_utils/test_copy.py pylint:use-yield-from  # suggested construct does not work with Python 2

tests/sanity/ignore-2.18.txt

@@ -1,4 +1,5 @@
 plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/module_utils/_api/api/client.py pylint:use-yield-from  # suggested construct does not work with Python 2
 plugins/module_utils/_api/utils/build.py pylint:use-yield-from  # suggested construct does not work with Python 2
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
 tests/unit/plugins/module_utils/test_copy.py pylint:use-yield-from  # suggested construct does not work with Python 2

tests/sanity/ignore-2.19.txt

@@ -1,4 +1,5 @@
 plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/module_utils/_api/api/client.py pylint:use-yield-from  # suggested construct does not work with Python 2
 plugins/module_utils/_api/utils/build.py pylint:use-yield-from  # suggested construct does not work with Python 2
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
 tests/unit/plugins/module_utils/test_copy.py pylint:use-yield-from  # suggested construct does not work with Python 2

tests/sanity/ignore-2.20.txt

@@ -1,4 +1,5 @@
+plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
 plugins/module_utils/_api/api/client.py pylint:use-yield-from  # suggested construct does not work with Python 2
 plugins/module_utils/_api/utils/build.py pylint:use-yield-from  # suggested construct does not work with Python 2
-plugins/modules/docker_container_copy_into.py validate-modules:undocumented-parameter # _max_file_size_for_diff is used by the action plugin
+plugins/module_utils/_six.py pylint:ansible-bad-import-from
 tests/unit/plugins/module_utils/test_copy.py pylint:use-yield-from  # suggested construct does not work with Python 2