diff options
author | Christian Heimes <cheimes@redhat.com> | 2016-11-21 10:24:17 +0100 |
---|---|---|
committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-24 15:46:40 +0100 |
commit | 2cbaf156045769b54150e4d4c3c1071f164a16fb (patch) | |
tree | e56ed216116635fb02adae9a58fc8b6e2e6ce1d5 /ipalib/capabilities.py | |
parent | 526bcea705d04895aa6b09bce996ac340783d1d0 (diff) | |
download | freeipa-2cbaf156045769b54150e4d4c3c1071f164a16fb.tar.gz freeipa-2cbaf156045769b54150e4d4c3c1071f164a16fb.tar.xz freeipa-2cbaf156045769b54150e4d4c3c1071f164a16fb.zip |
Replace LooseVersion
pylint is having a hard time with distutils.version in tox's virtual
envs. virtualenv uses some tricks to provide a virtual distutils
package, pylint can't cope with.
https://github.com/PyCQA/pylint/issues/73 suggests to use pkg_resources
instead. pkg_resources' version parser has some more benefits, e.g. PEP
440 conformity. But pkg_resources.parse_version() is a heavy weight solution
with reduced functionality, e.g. no access to major version.
For API_VERSION and plugin version we can use a much simpler and faster
approach.
https://fedorahosted.org/freeipa/ticket/6468
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipalib/capabilities.py')
-rw-r--r-- | ipalib/capabilities.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/capabilities.py b/ipalib/capabilities.py index 7ddaea2e7..55b84aa6b 100644 --- a/ipalib/capabilities.py +++ b/ipalib/capabilities.py @@ -25,7 +25,7 @@ This module defines a dict, ``capabilities``, that maps feature names to API versions they were introduced in. """ -from distutils import version +from ipapython.ipautil import APIVersion VERSION_WITHOUT_CAPABILITIES = u'2.51' @@ -64,6 +64,6 @@ def client_has_capability(client_version, capability): :param client_version: The API version string reported by the client """ - version_tuple = version.LooseVersion(client_version) + version = APIVersion(client_version) - return version_tuple >= version.LooseVersion(capabilities[capability]) + return version >= APIVersion(capabilities[capability]) |