diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-09-18 11:30:15 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-10-13 14:16:32 +0200 |
| commit | 59d87d53b10a201ef03077c96011523bdd1342e8 (patch) | |
| tree | d72834017dfef90e107cf3093beee9ede07a836b /ipalib/parameters.py | |
| parent | 5ff4170ff9cab64d3527001de8214cb30439e3e3 (diff) | |
| download | freeipa-59d87d53b10a201ef03077c96011523bdd1342e8.tar.gz freeipa-59d87d53b10a201ef03077c96011523bdd1342e8.tar.xz freeipa-59d87d53b10a201ef03077c96011523bdd1342e8.zip | |
Do not compare types that are not comparable in Python 3
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>
Diffstat (limited to 'ipalib/parameters.py')
| -rw-r--r-- | ipalib/parameters.py | 6 |
1 files changed, 3 insertions, 3 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) |