Use unicode

This commit is contained in:
Neal Norwitz 2007-08-26 02:22:30 +00:00
parent 312e10d63e
commit e1188629a6
1 changed files with 8 additions and 8 deletions

View File

@ -196,19 +196,19 @@ normalizeUserObj(PyObject *obj)
modname = "__builtin__";
}
if (strcmp(modname, "__builtin__") != 0)
return PyString_FromFormat("<%s.%s>",
modname,
fn->m_ml->ml_name);
return PyUnicode_FromFormat("<%s.%s>",
modname,
fn->m_ml->ml_name);
else
return PyString_FromFormat("<%s>",
fn->m_ml->ml_name);
return PyUnicode_FromFormat("<%s>",
fn->m_ml->ml_name);
}
else {
/* built-in method: try to return
repr(getattr(type(__self__), __name__))
*/
PyObject *self = fn->m_self;
PyObject *name = PyString_FromString(fn->m_ml->ml_name);
PyObject *name = PyUnicode_FromString(fn->m_ml->ml_name);
if (name != NULL) {
PyObject *mo = _PyType_Lookup(Py_Type(self), name);
Py_XINCREF(mo);
@ -221,8 +221,8 @@ normalizeUserObj(PyObject *obj)
}
}
PyErr_Clear();
return PyString_FromFormat("<built-in method %s>",
fn->m_ml->ml_name);
return PyUnicode_FromFormat("<built-in method %s>",
fn->m_ml->ml_name);
}
}