diff options
| -rw-r--r-- | ipalib/parameters.py | 6 | ||||
| -rw-r--r-- | ipatests/test_ipapython/test_ipautil.py | 2 | ||||
| -rw-r--r-- | ipatests/util.py | 10 |
3 files changed, 12 insertions, 6 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 34cd65d29..c74686271 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -1157,9 +1157,9 @@ class Decimal(Number): super(Decimal, self).__init__(name, *rules, **kw) - if (self.minvalue > self.maxvalue) \ - and (self.minvalue is not None and \ - self.maxvalue is not None): + if (self.minvalue is not None and + self.maxvalue is not None and + self.minvalue > self.maxvalue): raise ValueError( '%s: minvalue > maxvalue (minvalue=%s, maxvalue=%s)' % ( self.nice, self.minvalue, self.maxvalue) diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py index 609e1f0e5..e19cd2cb6 100644 --- a/ipatests/test_ipapython/test_ipautil.py +++ b/ipatests/test_ipapython/test_ipautil.py @@ -321,7 +321,7 @@ class TestCIDict(object): def test_fromkeys(self): dct = ipautil.CIDict.fromkeys(('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): diff --git a/ipatests/util.py b/ipatests/util.py index d180c91b7..85b5dbc5e 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -331,8 +331,14 @@ def assert_deepequal(expected, got, doc='', stack=tuple()): s_got = got s_expected = expected else: - s_got = sorted(got) - s_expected = sorted(expected) + try: + 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): g_sub = s_got[i] assert_deepequal(e_sub, g_sub, doc, stack + (i,)) |