Author: ezio.melotti Date: Sat Jan 30 14:32:14 2010 New Revision: 77852 Log: Merged revisions 77850-77851 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77850 | ezio.melotti | 2010-01-30 15:08:54 +0200 (Sat, 30 Jan 2010) | 1 line Relocate a couple of stars and remove redundant backticks ........ r77851 | ezio.melotti | 2010-01-30 15:27:05 +0200 (Sat, 30 Jan 2010) | 1 line Use the correct markup for args ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/c-api/long.rst Modified: python/branches/py3k/Doc/c-api/long.rst ============================================================================== --- python/branches/py3k/Doc/c-api/long.rst (original) +++ python/branches/py3k/Doc/c-api/long.rst Sat Jan 30 14:32:14 2010 @@ -84,7 +84,7 @@ Return a new :ctype:`PyLongObject` based on the string value in *str*, which is interpreted according to the radix in *base*. If *pend* is non-*NULL*, - ``*pend`` will point to the first character in *str* which follows the + *\*pend* will point to the first character in *str* which follows the representation of the number. If *base* is ``0``, the radix will be determined based on the leading characters of *str*: if *str* starts with ``'0x'`` or ``'0X'``, radix 16 will be used; if *str* starts with ``'0o'`` or @@ -119,25 +119,25 @@ and return -1. Convert non-long objects automatically to long first, and return -1 if that raises exceptions. -.. cfunction:: long PyLong_AsLongAndOverflow(PyObject *pylong, int* overflow) +.. cfunction:: long PyLong_AsLongAndOverflow(PyObject *pylong, int *overflow) Return a C :ctype:`long` representation of the contents of *pylong*. If *pylong* is greater than :const:`LONG_MAX` or less - than :const:`LONG_MIN`, set `*overflow` to ``1`` or ``-1``, - respectively, and return ``-1``; otherwise, set `*overflow` to + than :const:`LONG_MIN`, set *\*overflow* to ``1`` or ``-1``, + respectively, and return ``-1``; otherwise, set *\*overflow* to ``0``. If any other exception occurs (for example a TypeError or - MemoryError), then ``-1`` will be returned and ``*overflow`` will + MemoryError), then ``-1`` will be returned and *\*overflow* will be ``0``. -.. cfunction:: PY_LONG_LONG PyLong_AsLongLongAndOverflow(PyObject *pylong, int* overflow) +.. cfunction:: PY_LONG_LONG PyLong_AsLongLongAndOverflow(PyObject *pylong, int *overflow) Return a C :ctype:`long long` representation of the contents of *pylong*. If *pylong* is greater than :const:`PY_LLONG_MAX` or less - than :const:`PY_LLONG_MIN`, set `*overflow` to ``1`` or ``-1``, - respectively, and return ``-1``; otherwise, set `*overflow` to + than :const:`PY_LLONG_MIN`, set *\*overflow* to ``1`` or ``-1``, + respectively, and return ``-1``; otherwise, set *\*overflow* to ``0``. If any other exception occurs (for example a TypeError or - MemoryError), then ``-1`` will be returned and ``*overflow`` will + MemoryError), then ``-1`` will be returned and *\*overflow* will be ``0``. .. versionadded:: 3.2