Merged revisions 79875 via svnmerge from

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

........
  r79875 | mark.dickinson | 2010-04-06 23:18:23 +0100 (Tue, 06 Apr 2010) | 1 line

  More NaN consistency doc fixes.
........
This commit is contained in:
Mark Dickinson 2010-04-12 18:43:56 +00:00
parent 8280b999dd
commit b30da1277f
1 changed files with 3 additions and 3 deletions

View File

@ -327,9 +327,9 @@ Constants
:exc:`ValueError` for invalid operations like ``sqrt(-1.0)`` or ``log(0.0)``
(where C99 Annex F recommends signaling invalid operation or divide-by-zero),
and :exc:`OverflowError` for results that overflow (for example,
``exp(1000.0)``). A *NaN* will not be returned from any of the functions
above unless one or more of the input arguments was a *NaN*; in that case,
most functions will return a *NaN*, but (again following C99 Annex F) there
``exp(1000.0)``). A NaN will not be returned from any of the functions
above unless one or more of the input arguments was a NaN; in that case,
most functions will return a NaN, but (again following C99 Annex F) there
are some exceptions to this rule, for example ``pow(float('nan'), 0.0)`` or
``hypot(float('nan'), float('inf'))``.