diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-11-28 09:45:15 (GMT) |
|---|---|---|
| committer | Chris Jerdonek <chris.jerdonek@gmail.com> | 2012-11-28 09:45:15 (GMT) |
| commit | 16459e8b16dfa00bd9f0f1a6b1d7989dd1d4b93e (patch) | |
| tree | 4f86872908d34c6f492e292a88645a69549a8021 /Doc/c-api/object.rst | |
| parent | bff98fe5364452775d8273137c9087ed004deb96 (diff) | |
| parent | bb4e941c6d721c2461f7dd30a84565abc350eca3 (diff) | |
| download | cpython-16459e8b16dfa00bd9f0f1a6b1d7989dd1d4b93e.zip cpython-16459e8b16dfa00bd9f0f1a6b1d7989dd1d4b93e.tar.gz cpython-16459e8b16dfa00bd9f0f1a6b1d7989dd1d4b93e.tar.bz2 | |
Merge from 3.3: Add a str class entry to the string section (issue #16209).
This commit also moves the documentation for the str built-in function to
the new class entry. Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.
Diffstat (limited to 'Doc/c-api/object.rst')
| -rw-r--r-- | Doc/c-api/object.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst index e4769b3..02a0d36 100644 --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -160,10 +160,10 @@ Object Protocol a string similar to that returned by :c:func:`PyObject_Repr` in Python 2. Called by the :func:`ascii` built-in function. + .. index:: string; PyObject_Str (C function) -.. c:function:: PyObject* PyObject_Str(PyObject *o) - .. index:: builtin: str +.. c:function:: PyObject* PyObject_Str(PyObject *o) Compute a string representation of object *o*. Returns the string representation on success, *NULL* on failure. This is the equivalent of the |