Skip to content
Snippets Groups Projects
Unverified Commit 86701caf authored by Thomas Woerner's avatar Thomas Woerner Committed by GitHub
Browse files

Merge pull request #1350 from freeipa/remove_pkg_resources

ipareplica: Don't rely on pkg_resources whenever possible
parents d1857c18 b1328ba7
No related branches found
No related tags found
No related merge requests found
...@@ -80,6 +80,13 @@ except ImportError: ...@@ -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: ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment