summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-26 17:08:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-08-26 17:08:40 (GMT)
commit14cb6bcf2ba953735ec1ef622f8ff8e23db1f326 (patch)
tree6db192685c7b876eb3ebeebee8d5cffae0daa7fc
parente39be53c3cbdd2b623065e802e72a90d95f0bb31 (diff)
downloadcpython-14cb6bcf2ba953735ec1ef622f8ff8e23db1f326.zip
cpython-14cb6bcf2ba953735ec1ef622f8ff8e23db1f326.tar.gz
cpython-14cb6bcf2ba953735ec1ef622f8ff8e23db1f326.tar.bz2
sort of backport 66038 by aliasing PyObject_Bytes to PyObject_Str
-rw-r--r--Doc/c-api/object.rst8
-rw-r--r--Include/object.h1
-rw-r--r--Misc/NEWS5
3 files changed, 14 insertions, 0 deletions
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index a2487ff..76e8beb 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -130,6 +130,14 @@ Object Protocol
by the :keyword:`print` statement.
+.. cfunction:: PyObject* PyObject_Bytes(PyObject *o)
+
+ .. index:: builtin: bytes
+
+ Compute a bytes representation of object *o*. In 2.x, this is just a alias
+ for :cfunc:`PyObject_Str`.
+
+
.. cfunction:: PyObject* PyObject_Unicode(PyObject *o)
.. index:: builtin: unicode
diff --git a/Include/object.h b/Include/object.h
index 4fb8a90..b02689c 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -458,6 +458,7 @@ PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *);
PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
+#define PyObject_Bytes PyObject_Str
#ifdef Py_USING_UNICODE
PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
#endif
diff --git a/Misc/NEWS b/Misc/NEWS
index ff754df..f1aec99 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,11 @@ Core and Builtins
- Added warnings on the use of ``__getslice__``, ``__setslice__``, or
``__delslice__``.
+C-API
+-----
+
+- Aliased PyObject_Bytes to PyObject_Str.
+
Library
-------