summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-04-13 01:39:34 (GMT)
committerGuido van Rossum <guido@python.org>2007-04-13 01:39:34 (GMT)
commitad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a (patch)
tree2889cee1ac3e392aac63e7fc848e314d7cf2cda2 /Include
parentdc0b1a106981ee204936221f4e0863bd1d7a6ba6 (diff)
downloadcpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.zip
cpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.tar.gz
cpython-ad7d8d10b70b62b25fc8ebd1a6bfef0c008a232a.tar.bz2
Rough and dirty job -- allow concatenation of bytes and arbitrary
buffer-supporting objects (Unicode always excluded), and also of str and bytes. (For some reason u"" + b"" doesn't fail, I'll investigate later.)
Diffstat (limited to 'Include')
-rw-r--r--Include/bytesobject.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/bytesobject.h b/Include/bytesobject.h
index 849078d..bc385c1 100644
--- a/Include/bytesobject.h
+++ b/Include/bytesobject.h
@@ -34,6 +34,7 @@ PyAPI_DATA(PyTypeObject) PyBytes_Type;
/* Direct API functions */
PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *);
+PyAPI_FUNC(PyObject *) PyBytes_Concat(PyObject *, PyObject *);
PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t);
PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *);
PyAPI_FUNC(char *) PyBytes_AsString(PyObject *);