Merged revisions 84142 via svnmerge from
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.
........
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
index a264ac0..7ebd283 100644
--- a/Doc/c-api/arg.rst
+++ b/Doc/c-api/arg.rst
@@ -320,13 +320,14 @@
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
diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index 19d65b8..9a3d1f1 100644
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -165,6 +165,7 @@
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 @@
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)
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 50cc3a3..014571e 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -369,6 +369,7 @@
.. versionadded:: 3.1
+
.. cfunction:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
Decode a null-terminated string using :cdata:`Py_FileSystemDefaultEncoding`