Commit e1188629 authored by Neal Norwitz's avatar Neal Norwitz

Use unicode

parent 312e10d6
...@@ -196,19 +196,19 @@ normalizeUserObj(PyObject *obj) ...@@ -196,19 +196,19 @@ normalizeUserObj(PyObject *obj)
modname = "__builtin__"; modname = "__builtin__";
} }
if (strcmp(modname, "__builtin__") != 0) if (strcmp(modname, "__builtin__") != 0)
return PyString_FromFormat("<%s.%s>", return PyUnicode_FromFormat("<%s.%s>",
modname, modname,
fn->m_ml->ml_name); fn->m_ml->ml_name);
else else
return PyString_FromFormat("<%s>", return PyUnicode_FromFormat("<%s>",
fn->m_ml->ml_name); fn->m_ml->ml_name);
} }
else { else {
/* built-in method: try to return /* built-in method: try to return
repr(getattr(type(__self__), __name__)) repr(getattr(type(__self__), __name__))
*/ */
PyObject *self = fn->m_self; 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) { if (name != NULL) {
PyObject *mo = _PyType_Lookup(Py_Type(self), name); PyObject *mo = _PyType_Lookup(Py_Type(self), name);
Py_XINCREF(mo); Py_XINCREF(mo);
...@@ -221,8 +221,8 @@ normalizeUserObj(PyObject *obj) ...@@ -221,8 +221,8 @@ normalizeUserObj(PyObject *obj)
} }
} }
PyErr_Clear(); PyErr_Clear();
return PyString_FromFormat("<built-in method %s>", return PyUnicode_FromFormat("<built-in method %s>",
fn->m_ml->ml_name); fn->m_ml->ml_name);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment