traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Oops. The PyObject_Print() function was totally broken; the original code 

was relying on PyString.tp_print but that no longer works.
Fortunately it's rarely called; only the gdb 'pyo' command seems affected.
This commit is contained in:
Guido van Rossum 2007-08-09 20:47:59 +00:00
parent 66aaf74e52
commit 6ca130d0db
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Objects/object.c
View File

@ -284,12 +284,28 @@ internal_print(PyObject *op, FILE *fp, int flags, int nesting)
if (flags & Py_PRINT_RAW)
s = PyObject_Str(op);
else
s = PyObject_ReprStr8(op);
s = PyObject_Repr(op);
if (s == NULL)
ret = -1;
else if (PyString_Check(s)) {
fwrite(PyString_AS_STRING(s), 1,
PyString_GET_SIZE(s), fp);
}
else if (PyUnicode_Check(s)) {
PyObject *t;
t = _PyUnicode_AsDefaultEncodedString(s, NULL);
if (t == NULL)
ret = 0;
else {
fwrite(PyString_AS_STRING(t), 1,
PyString_GET_SIZE(t), fp);
}
}
else {
ret = internal_print(s, fp, Py_PRINT_RAW,
nesting+1);
PyErr_Format(PyExc_TypeError,
"str() or repr() returned '%.100s'",
s->ob_type->tp_name);
ret = -1;
}
Py_XDECREF(s);
}