replace deprecated distutils.version
Some checks failed
continuous-integration/drone/pr Build is failing
Some checks failed
continuous-integration/drone/pr Build is failing
This commit is contained in:
parent
298e7e4038
commit
cee0bb1476
@ -99,13 +99,13 @@ import json
|
|||||||
import re
|
import re
|
||||||
import socket
|
import socket
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
from distutils.version import LooseVersion
|
|
||||||
|
|
||||||
from ansible.errors import AnsibleError
|
from ansible.errors import AnsibleError
|
||||||
from ansible.module_utils._text import to_native
|
from ansible.module_utils._text import to_native
|
||||||
from ansible.module_utils.parsing.convert_bool import boolean
|
from ansible.module_utils.parsing.convert_bool import boolean
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.six import iteritems
|
||||||
from ansible.plugins.inventory import BaseInventoryPlugin
|
from ansible.plugins.inventory import BaseInventoryPlugin
|
||||||
|
from ansible_collections.xoxys.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from proxmoxer import ProxmoxAPI
|
from proxmoxer import ProxmoxAPI
|
||||||
|
24
plugins/module_utils/version.py
Normal file
24
plugins/module_utils/version.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
# Copyright (c) 2021, Felix Fontein <felix@fontein.de>
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
"""Provide version object to compare version numbers."""
|
||||||
|
|
||||||
|
from __future__ import absolute_import, division, print_function
|
||||||
|
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
from ansible.module_utils.six import raise_from
|
||||||
|
|
||||||
|
try:
|
||||||
|
from ansible.module_utils.compat.version import LooseVersion
|
||||||
|
except ImportError:
|
||||||
|
try:
|
||||||
|
from distutils.version import LooseVersion # noqa: F401, pylint: disable=unused-import
|
||||||
|
except ImportError as exc:
|
||||||
|
msg = (
|
||||||
|
"To use this plugin or module with ansible-core 2.11, you need to use Python < 3.12 "
|
||||||
|
"with distutils.version present"
|
||||||
|
)
|
||||||
|
raise_from(ImportError(msg), exc)
|
@ -216,6 +216,7 @@ from collections import defaultdict
|
|||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.basic import json
|
from ansible.module_utils.basic import json
|
||||||
|
from ansible_collections.xoxys.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
|
|
||||||
# Genereates a diff dictionary from an old and new table dump.
|
# Genereates a diff dictionary from an old and new table dump.
|
||||||
@ -357,7 +358,6 @@ class Iptables:
|
|||||||
|
|
||||||
# Checks if iptables is installed and if we have a correct version.
|
# Checks if iptables is installed and if we have a correct version.
|
||||||
def _check_compatibility(self):
|
def _check_compatibility(self):
|
||||||
from distutils.version import StrictVersion
|
|
||||||
cmd = [self.bins['iptables'], '--version']
|
cmd = [self.bins['iptables'], '--version']
|
||||||
rc, stdout, stderr = Iptables.module.run_command(cmd, check_rc=False)
|
rc, stdout, stderr = Iptables.module.run_command(cmd, check_rc=False)
|
||||||
if rc == 0:
|
if rc == 0:
|
||||||
@ -366,7 +366,7 @@ class Iptables:
|
|||||||
version = result.group(1)
|
version = result.group(1)
|
||||||
# CentOS 5 ip6tables (v1.3.x) doesn't support comments,
|
# CentOS 5 ip6tables (v1.3.x) doesn't support comments,
|
||||||
# which means it cannot be used with this module.
|
# which means it cannot be used with this module.
|
||||||
if StrictVersion(version) < StrictVersion('1.4'):
|
if LooseVersion(version) < LooseVersion('1.4'):
|
||||||
Iptables.module.fail_json(
|
Iptables.module.fail_json(
|
||||||
msg="This module isn't compatible with ip6tables versions older than 1.4.x"
|
msg="This module isn't compatible with ip6tables versions older than 1.4.x"
|
||||||
)
|
)
|
||||||
|
@ -813,9 +813,9 @@ import string
|
|||||||
import time
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
from distutils.version import LooseVersion
|
|
||||||
|
|
||||||
from ansible.module_utils.six.moves.urllib.parse import quote
|
from ansible.module_utils.six.moves.urllib.parse import quote
|
||||||
|
from ansible_collections.xoxys.general.plugins.module_utils.version import LooseVersion
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from proxmoxer import ProxmoxAPI
|
from proxmoxer import ProxmoxAPI
|
||||||
|
@ -10,7 +10,6 @@ import pytest
|
|||||||
|
|
||||||
proxmox = pytest.importorskip("proxmoxer")
|
proxmox = pytest.importorskip("proxmoxer")
|
||||||
|
|
||||||
from ansible.errors import AnsibleError, AnsibleParserError # noqa
|
|
||||||
from plugins.inventory.proxmox import InventoryModule
|
from plugins.inventory.proxmox import InventoryModule
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user