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
........

diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 9fa1899d4072956f6c7aa7dc4b78d8618fab4e68..96e3359c7796558574748eff733d5c1cd57f157a 100644 (file)
--- 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 2cd9dde358abb4af34ed761cf8775bd0e4f73e8d..bf8abe6187bcc36ee6a15aef1485090836587cd8 100644 (file)
--- 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
       >>>