IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for IPAVersion class

Browse Source 
Py3: classes with __eq__ must provide __hash__ function or set __hash__
to None.
Comparison function like __eq__ must signal unsupported types by
returning NotImplemented. Python turns this in a proper TypeError.
Make the version member read-only and cache _bytes represention.

https://fedorahosted.org/freeipa/ticket/6473

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Christian Heimes
2016-11-18 12:24:09 +01:00
committed by Martin Basti
parent 55b14abcb5
commit 29947fe1a3
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ipaplatform/redhat/tasks.py
View File

@@ -83,20 +83,26 @@ def selinux_enabled():
class IPAVersion(object): class IPAVersion(object):
def __init__(self, version): def __init__(self, version):
self.version = version self._version = version
self._bytes = version.encode('utf-8')
@property @property
def _bytes(self): def version(self):
return self.version.encode('utf-8') return self._version
def __eq__(self, other): def __eq__(self, other):
assert isinstance(other, IPAVersion) if not isinstance(other, IPAVersion):
return NotImplemented
return _librpm.rpmvercmp(self._bytes, other._bytes) == 0 return _librpm.rpmvercmp(self._bytes, other._bytes) == 0
def __lt__(self, other): def __lt__(self, other):
assert isinstance(other, IPAVersion) if not isinstance(other, IPAVersion):
return NotImplemented
return _librpm.rpmvercmp(self._bytes, other._bytes) < 0 return _librpm.rpmvercmp(self._bytes, other._bytes) < 0
def __hash__(self):
return hash(self._version)
class RedHatTaskNamespace(BaseTaskNamespace): class RedHatTaskNamespace(BaseTaskNamespace):