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

Do not compare types that are not comparable in Python 3

Browse Source 
In Python 3, different types are generally not comparable (except for equality),
and None can't be compared to None.
Fix cases of these comparisons.

In ipatest.util, give up on sorting lists if the sorting raises a TypeError.

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin
2015-09-18 11:30:15 +02:00
committed by Tomas Babej
parent 5ff4170ff9
commit 59d87d53b1
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipalib/parameters.py
View File

@@ -1157,9 +1157,9 @@ class Decimal(Number):
super(Decimal, self).__init__(name, *rules, **kw) super(Decimal, self).__init__(name, *rules, **kw)
if (self.minvalue > self.maxvalue) \ if (self.minvalue is not None and
and (self.minvalue is not None and \ self.maxvalue is not None and
self.maxvalue is not None): self.minvalue > self.maxvalue):
raise ValueError( raise ValueError(
'%s: minvalue > maxvalue (minvalue=%s, maxvalue=%s)' % ( '%s: minvalue > maxvalue (minvalue=%s, maxvalue=%s)' % (
self.nice, self.minvalue, self.maxvalue) self.nice, self.minvalue, self.maxvalue)

2
ipatests/test_ipapython/test_ipautil.py
View File

@@ -321,7 +321,7 @@ class TestCIDict(object):
def test_fromkeys(self): def test_fromkeys(self):
dct = ipautil.CIDict.fromkeys(('A', 'b', 'C')) dct = ipautil.CIDict.fromkeys(('A', 'b', 'C'))
assert sorted(dct.keys()) == sorted(['A', 'b', 'C']) assert sorted(dct.keys()) == sorted(['A', 'b', 'C'])
assert sorted(dct.values()) == [None] * 3 assert list(dct.values()) == [None] * 3
class TestTimeParser(object): class TestTimeParser(object):

10
ipatests/util.py
View File

@@ -331,8 +331,14 @@ def assert_deepequal(expected, got, doc='', stack=tuple()):
s_got = got s_got = got
s_expected = expected s_expected = expected
else: else:
s_got = sorted(got) try:
s_expected = sorted(expected) s_got = sorted(got)
except TypeError:
s_got = got
try:
s_expected = sorted(expected)
except TypeError:
s_expected = expected
for (i, e_sub) in enumerate(s_expected): for (i, e_sub) in enumerate(s_expected):
g_sub = s_got[i] g_sub = s_got[i]
assert_deepequal(e_sub, g_sub, doc, stack + (i,)) assert_deepequal(e_sub, g_sub, doc, stack + (i,))