mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 84142 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r84142 | georg.brandl | 2010-08-17 17:07:14 +0200 (Di, 17 Aug 2010) | 1 line

  Consistency check for versionadded/changed directives.
........
This commit is contained in:
Georg Brandl 2010-10-06 08:43:56 +00:00
parent 13f959b501
commit 23b4f927d5
18 changed files with 52 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Doc/c-api/arg.rst
View file

@ -320,13 +320,14 @@ Other objects
the conversion has failed. When the conversion fails, the *converter* function
should raise an exception and leave the content of *address* unmodified.
If the *converter* returns Py_CLEANUP_SUPPORTED, it may get called a second time
if the argument parsing eventually fails, giving the converter a chance to release
any memory that it had already allocated. In this second call, the *object* parameter
will be NULL; *address* will have the same value as in the original call.
If the *converter* returns ``Py_CLEANUP_SUPPORTED``, it may get called a
second time if the argument parsing eventually fails, giving the converter a
chance to release any memory that it had already allocated. In this second
call, the *object* parameter will be NULL; *address* will have the same value
as in the original call.
.. versionchanged:: 3.1
Py_CLEANUP_SUPPORTED was added.
``Py_CLEANUP_SUPPORTED`` was added.
``(items)`` (:class:`tuple`) [*matching-items*]
The object must be a Python sequence whose length is the number of format units

5
Doc/c-api/long.rst
View file

@ -165,6 +165,7 @@ All integers are implemented as "long" integer objects of arbitrary size.
cannot be represented as a :ctype:`long long`, an
:exc:`OverflowError` is raised and ``-1`` is returned.
.. cfunction:: unsigned PY_LONG_LONG PyLong_AsUnsignedLongLong(PyObject *pylong)
.. index::
@ -176,8 +177,8 @@ All integers are implemented as "long" integer objects of arbitrary size.
returned.
.. versionchanged:: 3.1
A negative *pylong* now raises :exc:`OverflowError`, not
:exc:`TypeError`.
A negative *pylong* now raises :exc:`OverflowError`, not :exc:`TypeError`.
.. cfunction:: unsigned long PyLong_AsUnsignedLongMask(PyObject *io)

1
Doc/c-api/unicode.rst
View file

@ -369,6 +369,7 @@ used, passsing :func:`PyUnicode_FSConverter` as the conversion function:
.. versionadded:: 3.1
.. cfunction:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
Decode a null-terminated string using :cdata:`Py_FileSystemDefaultEncoding`