mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Merged revisions 79583,79588-79589 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79583 | mark.dickinson | 2010-04-02 09:53:22 +0100 (Fri, 02 Apr 2010) | 7 lines Issue #2531: Make float-to-decimal comparisons return correct results. Float to decimal comparison operations now return a result based on the numeric values of the operands. Decimal.__hash__ has also been fixed so that Decimal and float values that compare equal have equal hash value. ........ r79588 | mark.dickinson | 2010-04-02 11:17:07 +0100 (Fri, 02 Apr 2010) | 2 lines Issue #7279: Make comparisons involving a Decimal sNaN signal InvalidOperation. ........ r79589 | mark.dickinson | 2010-04-02 11:35:12 +0100 (Fri, 02 Apr 2010) | 6 lines Issue #7279: Make Decimal('nan') hashable. Decimal('snan') remains unhashable. Also rewrite the Decimal __hash__ method so that it doesn't rely on float('inf') being valid: float('inf') could raise an exception on platforms not using IEEE 754 arithmetic. ........
This commit is contained in:
parent
5fc16b469e
commit
ac256ab284
4 changed files with 155 additions and 27 deletions
|
@ -358,6 +358,24 @@ Decimal objects
|
|||
compared, sorted, and coerced to another type (such as :class:`float` or
|
||||
:class:`int`).
|
||||
|
||||
Decimal objects cannot generally be combined with floats in
|
||||
arithmetic operations: an attempt to add a :class:`Decimal` to a
|
||||
:class:`float`, for example, will raise a :exc:`TypeError`.
|
||||
There's one exception to this rule: it's possible to use Python's
|
||||
comparison operators to compare a :class:`float` instance ``x``
|
||||
with a :class:`Decimal` instance ``y``. Without this exception,
|
||||
comparisons between :class:`Decimal` and :class:`float` instances
|
||||
would follow the general rules for comparing objects of different
|
||||
types described in the :ref:`expressions` section of the reference
|
||||
manual, leading to confusing results.
|
||||
|
||||
.. versionchanged:: 2.7
|
||||
A comparison between a :class:`float` instance ``x`` and a
|
||||
:class:`Decimal` instance ``y`` now returns a result based on
|
||||
the values of ``x`` and ``y``. In earlier versions ``x < y``
|
||||
returned the same (arbitrary) result for any :class:`Decimal`
|
||||
instance ``x`` and any :class:`float` instance ``y``.
|
||||
|
||||
In addition to the standard numeric properties, decimal floating point
|
||||
objects also have a number of specialized methods:
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue