Prepare for distutils.version being removed in Python 3.12 (#258)

* Prepare for distutils.version being removed in Python 2.12.

* Fix copy'n'paste error.

* Fix import.

* Re-add Loose prefix.

* Fix Python version typo.

* Improve formulation.

* Move message into own line.

* Fix casing, now that the object is no longer called Version.
This commit is contained in:
Felix Fontein
2021-12-24 11:28:35 +01:00
committed by GitHub
parent 93ea131f30
commit 4b235a2607
11 changed files with 40 additions and 16 deletions
+2 -1
View File
@@ -476,7 +476,8 @@ import sys
import tempfile
import traceback
from contextlib import contextmanager
from distutils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
try:
import yaml
+2 -1
View File
@@ -1189,13 +1189,14 @@ import pipes
import re
import shlex
import traceback
from distutils.version import LooseVersion
from time import sleep
from ansible.module_utils.common.text.formatters import human_to_bytes
from ansible.module_utils.six import string_types
from ansible.module_utils.common.text.converters import to_native, to_text
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
DifferenceTracker,
+2 -2
View File
@@ -326,8 +326,6 @@ import errno
import os
import traceback
from distutils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.common import (
clean_dict_booleans_for_docker_api,
docker_version,
@@ -339,6 +337,8 @@ from ansible_collections.community.docker.plugins.module_utils.common import (
)
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
if docker_version is not None:
try:
if LooseVersion(docker_version) >= LooseVersion('2.0.0'):
+2 -2
View File
@@ -252,10 +252,10 @@ network:
import re
import traceback
from distutils.version import LooseVersion
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
DockerBaseClass,
+1 -1
View File
@@ -186,7 +186,7 @@ except ImportError:
# missing Docker SDK for Python handled in ansible.module_utils.docker.common
pass
from distutils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,
+1 -1
View File
@@ -919,7 +919,7 @@ import shlex
import time
import traceback
from distutils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion
from ansible_collections.community.docker.plugins.module_utils.common import (
AnsibleDockerClient,