internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-25 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1350 from freeipa/remove_pkg_resources

Browse Source 
ipareplica: Don't rely on pkg_resources whenever possible
This commit is contained in:
Thomas Woerner
2025-04-17 14:50:43 +02:00
committed by GitHub
parent d1857c18ac b1328ba7d5
commit 86701caf8b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roles/ipareplica/module_utils/ansible_ipa_replica.py
View File

@@ -80,6 +80,13 @@ except ImportError:
try: try:
from contextlib import contextmanager as contextlib_contextmanager from contextlib import contextmanager as contextlib_contextmanager
from ipapython.version import NUM_VERSION, VERSION from ipapython.version import NUM_VERSION, VERSION
try:
from ipapython.version import parse_version
except ImportError:
# In IPA we either need pkg_resources or packaging Version
# class to compare versions with check_remote_version, so
# we let an exception to be raised if neither is available.
from pkg_resources import parse_version
if NUM_VERSION < 30201: if NUM_VERSION < 30201:
# See ipapython/version.py # See ipapython/version.py
@@ -99,8 +106,6 @@ try:
import dns.resolver as dnsresolver import dns.resolver as dnsresolver
import dns.reversename as dnsreversename import dns.reversename as dnsreversename
from pkg_resources import parse_version
from ipaclient.install.ipachangeconf import IPAChangeConf from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certstore, sysrestore from ipalib.install import certstore, sysrestore
from ipapython.ipautil import ipa_generate_password from ipapython.ipautil import ipa_generate_password