Mercurial > cpython-lru_cache-weakref

diff Objects/stringobject.c @ 47291:04bd3690fb1f legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Christian Heimes <christian@cheimes.de>
date Mon, 26 May 2008 12:29:14 +0000
parents ed2c1888e143
children 4fe192d48960
line wrap: on
line diff
--- a/Objects/stringobject.c	Mon May 26 11:42:40 2008 +0000
+++ b/Objects/stringobject.c	Mon May 26 12:29:14 2008 +0000
@@ -961,8 +961,8 @@
 		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);