[Python-checkins] r77522 - in python/branches/release31-maint: Doc/library/math.rst Doc/library/os.rst

[ezio.melotti]

Author: ezio.melotti
Date: Sat Jan 16 15:52:34 2010
New Revision: 77522

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/math.rst
   python/branches/release31-maint/Doc/library/os.rst

Modified: python/branches/release31-maint/Doc/library/math.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/math.rst	(original)
+++ python/branches/release31-maint/Doc/library/math.rst	Sat Jan 16 15:52:34 2010
@@ -299,10 +299,7 @@
    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

Modified: python/branches/release31-maint/Doc/library/os.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/os.rst	(original)
+++ python/branches/release31-maint/Doc/library/os.rst	Sat Jan 16 15:52:34 2010
@@ -1026,9 +1026,9 @@
       >>> 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
       >>>