diff options
| author | Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> | 2009-04-26 21:06:15 +0000 |
|---|---|---|
| committer | Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> | 2009-04-26 21:06:15 +0000 |
| commit | ca0002a4f38ab3b523d6b9743e48ec5f14203666 (patch) | |
| tree | de9a8649a148ea7c6fd3f94b6ab72e05eee0af7f /Doc/c-api/mapping.rst | |
| parent | 889e1d31e0804944da1e1eabd4b59cfa4c19221c (diff) | |
| download | cpython-ca0002a4f38ab3b523d6b9743e48ec5f14203666.tar.gz | |
Merged revisions 71898-71900,71910,71914-71919 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71898 | jeroen.ruigrok | 2009-04-25 16:24:30 +0200 (za, 25 apr 2009) | 2 lines
Reformat prior to editing.
........
r71899 | jeroen.ruigrok | 2009-04-25 16:27:00 +0200 (za, 25 apr 2009) | 3 lines
The type for ppos has been Py_ssize_t since 2.5, reflect this in the
documentation.
........
r71900 | jeroen.ruigrok | 2009-04-25 16:28:02 +0200 (za, 25 apr 2009) | 2 lines
Reformat paragraph.
........
r71910 | jeroen.ruigrok | 2009-04-25 19:59:03 +0200 (za, 25 apr 2009) | 4 lines
Issue #4129: Belatedly document which C API functions had their argument(s) or
return type changed from int or int * to Py_ssize_t or Py_ssize_t * as this
might cause problems on 64-bit platforms.
........
r71914 | jeroen.ruigrok | 2009-04-25 20:31:20 +0200 (za, 25 apr 2009) | 2 lines
Reformat prior to editing.
........
r71915 | jeroen.ruigrok | 2009-04-25 20:46:03 +0200 (za, 25 apr 2009) | 2 lines
Issue #4129: Document more int -> Py_ssize_t changes.
........
r71916 | jeroen.ruigrok | 2009-04-25 20:53:48 +0200 (za, 25 apr 2009) | 2 lines
Reformat prior to editing.
........
r71917 | jeroen.ruigrok | 2009-04-25 20:57:32 +0200 (za, 25 apr 2009) | 2 lines
Reference to an int type, whereas it's a Py_ssize_t as the synopsis states.
........
r71918 | jeroen.ruigrok | 2009-04-25 21:04:15 +0200 (za, 25 apr 2009) | 2 lines
Since I edited this file, reformat for future edits.
........
r71919 | jeroen.ruigrok | 2009-04-25 21:10:52 +0200 (za, 25 apr 2009) | 2 lines
Reformat prior to editing.
........
Diffstat (limited to 'Doc/c-api/mapping.rst')
| -rw-r--r-- | Doc/c-api/mapping.rst | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst index 177b215a82..c2c22e50e2 100644 --- a/Doc/c-api/mapping.rst +++ b/Doc/c-api/mapping.rst @@ -12,7 +12,8 @@ Mapping Protocol function always succeeds. -.. cfunction:: Py_ssize_t PyMapping_Length(PyObject *o) +.. cfunction:: Py_ssize_t PyMapping_Size(PyObject *o) + Py_ssize_t PyMapping_Length(PyObject *o) .. index:: builtin: len @@ -20,6 +21,10 @@ Mapping Protocol objects that do not provide mapping protocol, this is equivalent to the Python expression ``len(o)``. + .. versionchanged:: 2.5 + These functions returned an :ctype:`int` type. This might require + changes in your code for properly supporting 64-bit systems. + .. cfunction:: int PyMapping_DelItemString(PyObject *o, char *key) |