[Python-checkins] r75764 - in python/branches/release26-maint: Doc/c-api/exceptions.rst Doc/tutorial/floatingpoint.rst
georg.brandl
python-checkins at python.org
Tue Oct 27 14:28:11 CET 2009
Author: georg.brandl
Date: Tue Oct 27 14:28:11 2009
New Revision: 75764
Log:
Merged revisions 69131,69140-69141,69155 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69131 | andrew.kuchling | 2009-01-31 04:26:02 +0100 (Sa, 31 Jan 2009) | 1 line
Text edits and markup fixes
........
r69140 | benjamin.peterson | 2009-01-31 17:52:03 +0100 (Sa, 31 Jan 2009) | 1 line
PyErr_BadInternalCall() raises a SystemError, not TypeError #5112
........
r69141 | benjamin.peterson | 2009-01-31 21:01:48 +0100 (Sa, 31 Jan 2009) | 1 line
fix indentation
........
r69155 | david.goodger | 2009-01-31 23:53:46 +0100 (Sa, 31 Jan 2009) | 1 line
markup fix
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/c-api/exceptions.rst
python/branches/release26-maint/Doc/tutorial/floatingpoint.rst
Modified: python/branches/release26-maint/Doc/c-api/exceptions.rst
==============================================================================
--- python/branches/release26-maint/Doc/c-api/exceptions.rst (original)
+++ python/branches/release26-maint/Doc/c-api/exceptions.rst Tue Oct 27 14:28:11 2009
@@ -291,9 +291,10 @@
.. cfunction:: void PyErr_BadInternalCall()
- This is a shorthand for ``PyErr_SetString(PyExc_TypeError, message)``, where
- *message* indicates that an internal operation (e.g. a Python/C API function)
- was invoked with an illegal argument. It is mostly for internal use.
+ This is a shorthand for ``PyErr_SetString(PyExc_SystemError, message)``,
+ where *message* indicates that an internal operation (e.g. a Python/C API
+ function) was invoked with an illegal argument. It is mostly for internal
+ use.
.. cfunction:: int PyErr_WarnEx(PyObject *category, char *message, int stacklevel)
Modified: python/branches/release26-maint/Doc/tutorial/floatingpoint.rst
==============================================================================
--- python/branches/release26-maint/Doc/tutorial/floatingpoint.rst (original)
+++ python/branches/release26-maint/Doc/tutorial/floatingpoint.rst Tue Oct 27 14:28:11 2009
@@ -157,7 +157,7 @@
machines today (November 2000) use IEEE-754 floating point arithmetic, and
almost all platforms map Python floats to IEEE-754 "double precision". 754
doubles contain 53 bits of precision, so on input the computer strives to
-convert 0.1 to the closest fraction it can of the form *J*/2\*\**N* where *J* is
+convert 0.1 to the closest fraction it can of the form *J*/2**\ *N* where *J* is
an integer containing exactly 53 bits. Rewriting ::
1 / 10 ~= J / (2**N)
More information about the Python-checkins
mailing list