Patch #1686451: Fix return type for PySequence_{Count,Index,Fast_GET_SIZE}.

Will backport.

diff --git a/Doc/api/abstract.tex b/Doc/api/abstract.tex
index 1a498b9009dcf5704b18eb0d20330497226c4709..5bd5a9a3d235fe582bc940a9bf627896b9785e5e 100644 (file)
--- a/Doc/api/abstract.tex
+++ b/Doc/api/abstract.tex
@@ -810,7 +810,7 @@ determination.
   the Python statement \samp{del \var{o}[\var{i1}:\var{i2}]}.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PySequence_Count}{PyObject *o, PyObject *value}
+\begin{cfuncdesc}{Py_ssize_t}{PySequence_Count}{PyObject *o, PyObject *value}
   Return the number of occurrences of \var{value} in \var{o}, that is,
   return the number of keys for which \code{\var{o}[\var{key}] ==
   \var{value}}.  On failure, return \code{-1}.  This is equivalent to
@@ -824,7 +824,7 @@ determination.
   expression \samp{\var{value} in \var{o}}.
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PySequence_Index}{PyObject *o, PyObject *value}
+\begin{cfuncdesc}{Py_ssize_t}{PySequence_Index}{PyObject *o, PyObject *value}
   Return the first index \var{i} for which \code{\var{o}[\var{i}] ==
   \var{value}}.  On error, return \code{-1}.    This is equivalent to
   the Python expression \samp{\var{o}.index(\var{value})}.
@@ -874,7 +874,7 @@ determination.
   \versionadded{2.3}
 \end{cfuncdesc}
 
-\begin{cfuncdesc}{int}{PySequence_Fast_GET_SIZE}{PyObject *o}
+\begin{cfuncdesc}{Py_ssize_t}{PySequence_Fast_GET_SIZE}{PyObject *o}
   Returns the length of \var{o}, assuming that \var{o} was
   returned by \cfunction{PySequence_Fast()} and that \var{o} is
   not \NULL.  The size can also be gotten by calling

diff --git a/Misc/NEWS b/Misc/NEWS
index fdada8da389d4c04bbd1a4b5bde2fdc49fc87b8f..1f1caee8e77dfdd4c2ccc98176f4bead0a4c8501 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -711,6 +711,9 @@ Tools
 Documentation
 -------------
 
+- Patch #1686451: Fix return type for
+  PySequence_{Count,Index,Fast_GET_SIZE}.
+
 - Patch #1679379: add documentation for fnmatch.translate().
 
 - Bug #1629566: clarify the docs on the return values of parsedate()