diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-26 12:29:14 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-26 12:29:14 (GMT) |
| commit | 3497f9447633b0a60a0b42ba06f2246805b20bb9 (patch) | |
| tree | adbb433e1bbe57b2fa11c6810eb962b75f663db6 /Objects/stringobject.c | |
| parent | b4701e638c1030e575adf441aab01ad6319cc83d (diff) | |
| download | cpython-3497f9447633b0a60a0b42ba06f2246805b20bb9.zip cpython-3497f9447633b0a60a0b42ba06f2246805b20bb9.tar.gz cpython-3497f9447633b0a60a0b42ba06f2246805b20bb9.tar.bz2 | |
First step of the C API rename:
renamed Include/bytesobject.h to Include/bytearrayobject.h
renamed Include/stringobject.h to Include/bytesobject.h
added Include/stringobject.h with aliases
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 6ac15f5..ea1069d 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -961,8 +961,8 @@ string_concat(register PyStringObject *a, register PyObject *bb) if (PyUnicode_Check(bb)) return PyUnicode_Concat((PyObject *)a, bb); #endif - if (PyBytes_Check(bb)) - return PyBytes_Concat((PyObject *)a, bb); + if (PyByteArray_Check(bb)) + return PyByteArray_Concat((PyObject *)a, bb); PyErr_Format(PyExc_TypeError, "cannot concatenate 'str' and '%.200s' objects", Py_TYPE(bb)->tp_name); |