Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Expect unicode in class_name.

This commit is contained in:
Martin v. Löwis 2007-06-10 21:13:34 +00:00
parent 826b9ddbe3
commit 9b9905b2f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/typeobject.c
View File

@ -1010,7 +1010,7 @@ class_name(PyObject *cls)
}
if (name == NULL)
return NULL;
if (!PyString_Check(name)) {
if (!PyUnicode_Check(name)) {
Py_DECREF(name);
return NULL;
}
@ -1032,7 +1032,7 @@ check_duplicates(PyObject *list)
o = class_name(o);
PyErr_Format(PyExc_TypeError,
"duplicate base class %s",
o ? PyString_AS_STRING(o) : "?");
o ? PyUnicode_AsString(o) : "?");
Py_XDECREF(o);
return -1;
}
@ -1078,7 +1078,7 @@ consistent method resolution\norder (MRO) for bases");
while (PyDict_Next(set, &i, &k, &v) && (size_t)off < sizeof(buf)) {
PyObject *name = class_name(k);
off += PyOS_snprintf(buf + off, sizeof(buf) - off, " %s",
name ? PyString_AS_STRING(name) : "?");
name ? PyUnicode_AsString(name) : "?");
Py_XDECREF(name);
if (--n && (size_t)(off+1) < sizeof(buf)) {
buf[off++] = ',';