From 573c08c1b73048876b62d99ff8d82337dc8ce0a2 Mon Sep 17 00:00:00 2001 From: Walter Dörwald Date: Fri, 25 May 2007 15:46:59 +0000 Subject: Change PyErr_Format() to generate a unicode string (by using PyUnicode_FromFormatV() instead of PyString_FromFormatV()). Change calls to PyErr_Format() to benefit from the new format specifiers: Using %S, object instead of %s, PyString_AS_STRING(object) with will work with unicode objects too. --- Python/codecs.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'Python/codecs.c') diff --git a/Python/codecs.c b/Python/codecs.c index ddd19359ac9..3aa1f386e7b 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -443,18 +443,13 @@ static void wrong_exception_type(PyObject *exc) { PyObject *type = PyObject_GetAttrString(exc, "__class__"); if (type != NULL) { - PyObject *name = PyObject_GetAttrString(type, "__name__"); - Py_DECREF(type); - if (name != NULL) { - PyObject *string = PyObject_Str(name); - Py_DECREF(name); - if (string != NULL) { - PyErr_Format(PyExc_TypeError, - "don't know how to handle %.400s in error callback", - PyString_AS_STRING(string)); - Py_DECREF(string); - } - } + PyObject *name = PyObject_GetAttrString(type, "__name__"); + Py_DECREF(type); + if (name != NULL) { + PyErr_Format(PyExc_TypeError, + "don't know how to handle %S in error callback", name); + Py_DECREF(name); + } } } -- cgit v1.2.3