summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-05-26 12:29:14 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-05-26 12:29:14 (GMT)
commit3497f9447633b0a60a0b42ba06f2246805b20bb9 (patch)
treeadbb433e1bbe57b2fa11c6810eb962b75f663db6 /Objects/unicodeobject.c
parentb4701e638c1030e575adf441aab01ad6319cc83d (diff)
downloadcpython-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/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 6d693fe..c008bd6 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1084,7 +1084,7 @@ PyObject *PyUnicode_FromEncodedObject(register PyObject *obj,
s = PyString_AS_STRING(obj);
len = PyString_GET_SIZE(obj);
}
- else if (PyBytes_Check(obj)) {
+ else if (PyByteArray_Check(obj)) {
/* Python 2.x specific */
PyErr_Format(PyExc_TypeError,
"decoding bytearray is not supported");