Merge with 3.4

This commit is contained in:
Zachary Ware 2015-02-19 22:15:54 -06:00
commit 4785f5e249
1 changed files with 1 additions and 1 deletions

View File

@ -1075,7 +1075,7 @@ Comparison of objects of the same type depends on the type:
* Numbers are compared arithmetically.
* The values :const:`float('NaN')` and :const:`Decimal('NaN')` are special.
The are identical to themselves, ``x is x`` but are not equal to themselves,
They are identical to themselves, ``x is x`` but are not equal to themselves,
``x != x``. Additionally, comparing any value to a not-a-number value
will return ``False``. For example, both ``3 < float('NaN')`` and
``float('NaN') < 3`` will return ``False``.