diff options
| author | Georg Brandl <georg@python.org> | 2008-05-11 14:30:18 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-05-11 14:30:18 (GMT) |
| commit | 95817b36f0310f21fa2ec4099db72596b3442c13 (patch) | |
| tree | ef148aec01d7bd43ba57875cce9620d8a8fd7d73 /Doc/reference | |
| parent | 6e6dcb5719cd3fec7a917e3d7954247305d8e50d (diff) | |
| download | cpython-95817b36f0310f21fa2ec4099db72596b3442c13.zip cpython-95817b36f0310f21fa2ec4099db72596b3442c13.tar.gz cpython-95817b36f0310f21fa2ec4099db72596b3442c13.tar.bz2 | |
Remove mentions of "plain" integers.
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/datamodel.rst | 7 | ||||
| -rw-r--r-- | Doc/reference/expressions.rst | 6 | ||||
| -rw-r--r-- | Doc/reference/lexical_analysis.rst | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 1e33fa3..3912d1e 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -172,10 +172,7 @@ Ellipsis There are two types of integers: - Plain integers - .. index:: - object: plain integer - single: OverflowError (built-in exception) + Integers These represent numbers in an unlimited range, subject to available (virtual) memory only. For the purpose of shift and mask operations, a binary @@ -191,7 +188,7 @@ Ellipsis These represent the truth values False and True. The two objects representing the values False and True are the only Boolean objects. The Boolean type is a - subtype of plain integers, and Boolean values behave like the values 0 and 1, + subtype of the integer type, and Boolean values behave like the values 0 and 1, respectively, in almost all contexts, the exception being that when converted to a string, the strings ``"False"`` or ``"True"`` are returned, respectively. diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index a5e858b..af79e53 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -821,9 +821,9 @@ The unary ``+`` (plus) operator yields its numeric argument unchanged. .. index:: single: inversion -The unary ``~`` (invert) operator yields the bitwise inversion of its plain or -long integer argument. The bitwise inversion of ``x`` is defined as -``-(x+1)``. It only applies to integral numbers. +The unary ``~`` (invert) operator yields the bitwise inversion of its integer +argument. The bitwise inversion of ``x`` is defined as ``-(x+1)``. It only +applies to integral numbers. .. index:: exception: TypeError diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 5748b9e..fdb5f99 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -565,9 +565,9 @@ Numeric literals floating point literal, hexadecimal literal octal literal, binary literal, decimal literal, imaginary literal, complex literal -There are three types of numeric literals: plain integers, floating point -numbers, and imaginary numbers. There are no complex literals -(complex numbers can be formed by adding a real number and an imaginary number). +There are three types of numeric literals: integers, floating point numbers, and +imaginary numbers. There are no complex literals (complex numbers can be formed +by adding a real number and an imaginary number). Note that numeric literals do not include a sign; a phrase like ``-1`` is actually an expression composed of the unary operator '``-``' and the literal |