Prepare 5.0.0 (#1123)

* Bump version to 5.0.0-a1.

* Drop support for ansible-core 2.15 and 2.16.

* Remove Python 2 and early Python 3 compatibility.

plugins/module_utils/_api/transport/basehttpadapter.py

@@ -7,8 +7,7 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 from .._import_helper import HTTPAdapter as _HTTPAdapter
 

plugins/module_utils/_api/transport/npipeconn.py

@@ -7,10 +7,9 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from ansible_collections.community.docker.plugins.module_utils._six import Empty
+from queue import Empty
 
 from .. import constants
 from .._import_helper import HTTPAdapter, urllib3, urllib3_connection

plugins/module_utils/_api/transport/npipesocket.py

@@ -7,16 +7,13 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import functools
 import io
 import time
 import traceback
 
-from ansible_collections.community.docker.plugins.module_utils._six import PY2
-
 PYWIN32_IMPORT_ERROR = None
 try:
     import win32file
@@ -152,9 +149,6 @@ class NpipeSocket(object):
 
     @check_closed
     def recv_into(self, buf, nbytes=0):
-        if PY2:
-            return self._recv_into_py2(buf, nbytes)
-
         readbuf = buf
         if not isinstance(buf, memoryview):
             readbuf = memoryview(buf)
@@ -176,12 +170,6 @@ class NpipeSocket(object):
         finally:
             win32api.CloseHandle(event)
 
-    def _recv_into_py2(self, buf, nbytes):
-        err, data = win32file.ReadFile(self._handle, nbytes or len(buf))
-        n = len(data)
-        buf[:n] = data
-        return n
-
     @check_closed
     def send(self, string, flags=0):
         event = win32event.CreateEvent(None, True, True, None)

plugins/module_utils/_api/transport/sshconn.py

@@ -7,8 +7,7 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import logging
 import os
@@ -16,8 +15,8 @@ import signal
 import socket
 import subprocess
 import traceback
-
-from ansible_collections.community.docker.plugins.module_utils._six import PY3, Empty, urlparse
+from queue import Empty
+from urllib.parse import urlparse
 
 from .basehttpadapter import BaseHTTPAdapter
 from .. import constants
@@ -100,8 +99,7 @@ class SSHSocket(socket.socket):
     def makefile(self, mode):
         if not self.proc:
             self.connect()
-        if PY3:
-            self.proc.stdout.channel = self
+        self.proc.stdout.channel = self
 
         return self.proc.stdout
 

plugins/module_utils/_api/transport/ssladapter.py

@@ -7,8 +7,7 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 """ Resolves OpenSSL issues in some servers:
       https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/

plugins/module_utils/_api/transport/unixconn.py

@@ -7,13 +7,10 @@
 # It is licensed under the Apache 2.0 license (see LICENSES/Apache-2.0.txt in this collection)
 # SPDX-License-Identifier: Apache-2.0
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import socket
 
-from ansible_collections.community.docker.plugins.module_utils._six import PY2
-
 from .basehttpadapter import BaseHTTPAdapter
 from .. import constants
 
@@ -46,12 +43,9 @@ class UnixHTTPConnection(urllib3_connection.HTTPConnection, object):
             self.disable_buffering = True
 
     def response_class(self, sock, *args, **kwargs):
-        if PY2:
-            # FIXME: We may need to disable buffering on Py3 as well,
-            # but there's no clear way to do it at the moment. See:
-            # https://github.com/docker/docker-py/issues/1799
-            kwargs['buffering'] = not self.disable_buffering
-
+        # FIXME: We may need to disable buffering on Py3,
+        # but there's no clear way to do it at the moment. See:
+        # https://github.com/docker/docker-py/issues/1799
         return super(UnixHTTPConnection, self).response_class(sock, *args, **kwargs)