[Python-3000-checkins] r59285 - python/branches/py3k/Doc/c-api/abstract.rst python/branches/py3k/Doc/c-api/utilities.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Dec  3 00:11:00 2007
New Revision: 59285

Modified:
   python/branches/py3k/Doc/c-api/abstract.rst
   python/branches/py3k/Doc/c-api/utilities.rst
Log:
Remove mentions of "long integer" in the API docs.


Modified: python/branches/py3k/Doc/c-api/abstract.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/abstract.rst	(original)
+++ python/branches/py3k/Doc/c-api/abstract.rst	Mon Dec  3 00:11:00 2007
@@ -583,7 +583,7 @@
 
    .. index:: builtin: long
 
-   Returns the *o* converted to a long integer object on success, or *NULL* on
+   Returns the *o* converted to an integer object on success, or *NULL* on
    failure.  This is the equivalent of the Python expression ``long(o)``.
 
 

Modified: python/branches/py3k/Doc/c-api/utilities.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/utilities.rst	(original)
+++ python/branches/py3k/Doc/c-api/utilities.rst	Mon Dec  3 00:11:00 2007
@@ -557,7 +557,7 @@
    Convert a Python integer to a C :ctype:`long int`.
 
 ``k`` (integer) [unsigned long]
-   Convert a Python integer or long integer to a C :ctype:`unsigned long` without
+   Convert a Python integer to a C :ctype:`unsigned long` without
    overflow checking.
 
 ``L`` (integer) [PY_LONG_LONG]
@@ -566,12 +566,12 @@
    Windows).
 
 ``K`` (integer) [unsigned PY_LONG_LONG]
-   Convert a Python integer or long integer to a C :ctype:`unsigned long long`
+   Convert a Python integer to a C :ctype:`unsigned long long`
    without overflow checking.  This format is only available on platforms that
    support :ctype:`unsigned long long` (or :ctype:`unsigned _int64` on Windows).
 
 ``n`` (integer) [Py_ssize_t]
-   Convert a Python integer or long integer to a C :ctype:`Py_ssize_t`.
+   Convert a Python integer to a C :ctype:`Py_ssize_t`.
 
 ``c`` (string of length 1) [char]
    Convert a Python character, represented as a string of length 1, to a C
@@ -647,11 +647,11 @@
    in *items*.  The C arguments must correspond to the individual format units in
    *items*.  Format units for sequences may be nested.
 
-It is possible to pass Python long integers where integers are requested;
-however no proper range checking is done --- the most significant bits are
-silently truncated when the receiving field is too small to receive the value
-(actually, the semantics are inherited from downcasts in C --- your mileage may
-vary).
+It is possible to pass "long" integers (integers whose value exceeds the
+platform's :const:`LONG_MAX`) however no proper range checking is done --- the
+most significant bits are silently truncated when the receiving field is too
+small to receive the value (actually, the semantics are inherited from downcasts
+in C --- your mileage may vary).
 
 A few other characters have a meaning in a format string.  These may not occur
 inside nested parentheses.  They are:
@@ -849,15 +849,15 @@
       integer object, if it is larger than ``sys.maxint``.
 
    ``L`` (long) [PY_LONG_LONG]
-      Convert a C :ctype:`long long` to a Python long integer object. Only available
+      Convert a C :ctype:`long long` to a Python integer object. Only available
       on platforms that support :ctype:`long long`.
 
    ``K`` (long) [unsigned PY_LONG_LONG]
-      Convert a C :ctype:`unsigned long long` to a Python long integer object. Only
+      Convert a C :ctype:`unsigned long long` to a Python integer object. Only
       available on platforms that support :ctype:`unsigned long long`.
 
    ``n`` (int) [Py_ssize_t]
-      Convert a C :ctype:`Py_ssize_t` to a Python integer or long integer.
+      Convert a C :ctype:`Py_ssize_t` to a Python integer.
 
    ``c`` (string of length 1) [char]
       Convert a C :ctype:`int` representing a character to a Python string of length