changed repr and str to always convert unicode strings
to 8-bit strings, using the default encoding.
diff --git a/Objects/object.c b/Objects/object.c
index 3052d38..7f38dff 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -265,6 +265,14 @@
res = (*v->ob_type->tp_repr)(v);
if (res == NULL)
return NULL;
+ if (PyUnicode_Check(res)) {
+ PyObject* str;
+ str = PyUnicode_AsEncodedString(res, NULL, NULL);
+ if (str) {
+ Py_DECREF(res);
+ res = str;
+ }
+ }
if (!PyString_Check(res)) {
PyErr_Format(PyExc_TypeError,
"__repr__ returned non-string (type %.200s)",
@@ -302,6 +310,14 @@
}
if (res == NULL)
return NULL;
+ if (PyUnicode_Check(res)) {
+ PyObject* str;
+ str = PyUnicode_AsEncodedString(res, NULL, NULL);
+ if (str) {
+ Py_DECREF(res);
+ res = str;
+ }
+ }
if (!PyString_Check(res)) {
PyErr_Format(PyExc_TypeError,
"__str__ returned non-string (type %.200s)",