diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-16 14:52:34 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-16 14:52:34 (GMT) |
| commit | 9ce52610f4bc688ec698424e55d45d49b090668b (patch) | |
| tree | d9f2981404f3ec1002630bab8e53ee3c0c239350 | |
| parent | 46e4dd21c4ddb89f8771b629aca160c3affecf8c (diff) | |
| download | cpython-9ce52610f4bc688ec698424e55d45d49b090668b.zip cpython-9ce52610f4bc688ec698424e55d45d49b090668b.tar.gz cpython-9ce52610f4bc688ec698424e55d45d49b090668b.tar.bz2 | |
Merged revisions 77520-77521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r77520 | georg.brandl | 2010-01-16 16:41:21 +0200 (Sat, 16 Jan 2010) | 1 line
Remove L suffix for integers.
........
r77521 | ezio.melotti | 2010-01-16 16:46:27 +0200 (Sat, 16 Jan 2010) | 1 line
remove obsolete sentence
........
| -rw-r--r-- | Doc/library/math.rst | 5 | ||||
| -rw-r--r-- | Doc/library/os.rst | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 9fa1899..96e3359 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -299,10 +299,7 @@ Constants error-reporting behavior from the platform C implementation. As a result, the specific exceptions raised in error cases (and even whether some arguments are considered to be exceptional at all) are not defined in any - useful cross-platform or cross-release way. For example, whether - ``math.log(0)`` returns ``-Inf`` or raises :exc:`ValueError` or - :exc:`OverflowError` isn't defined, and in cases where ``math.log(0)`` raises - :exc:`OverflowError`, ``math.log(0L)`` may raise :exc:`ValueError` instead. + useful cross-platform or cross-release way. All functions return a quiet *NaN* if at least one of the args is *NaN*. Signaling *NaN*\s raise an exception. The exception type still depends on the diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 2cd9dde..bf8abe6 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1026,9 +1026,9 @@ Files and Directories >>> import os >>> statinfo = os.stat('somefile.txt') >>> statinfo - (33188, 422511L, 769L, 1, 1032, 100, 926L, 1105022698,1105022732, 1105022732) + (33188, 422511, 769, 1, 1032, 100, 926, 1105022698,1105022732, 1105022732) >>> statinfo.st_size - 926L + 926 >>> |