Merged revisions 74564 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74564 | mark.dickinson | 2009-08-28 14:25:02 +0100 (Fri, 28 Aug 2009) | 3 lines

  Issue #6794:  Fix handling of NaNs in Decimal.compare_total and
  Decimal.compare_total_mag.
........
This commit is contained in:
Mark Dickinson 2009-08-28 13:35:02 +00:00
parent fa680dcd2f
commit 7f265b7fac
3 changed files with 24 additions and 2 deletions

View file

@ -2693,12 +2693,15 @@ class Decimal(object):
other_nan = other._isnan()
if self_nan or other_nan:
if self_nan == other_nan:
if self._int < other._int:
# compare payloads as though they're integers
self_key = len(self._int), self._int
other_key = len(other._int), other._int
if self_key < other_key:
if sign:
return _One
else:
return _NegativeOne
if self._int > other._int:
if self_key > other_key:
if sign:
return _NegativeOne
else: