Change float.__str__() and complex.__str__() to return

unicode objects.

diff --git a/Include/pyport.h b/Include/pyport.h
index fb57aceb37094f1c49d138847cecb6fbe3e0753c..92ce3aec5e665618e79c5cd01dd0406491b29c2f 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -107,6 +107,7 @@ typedef Py_intptr_t Py_ssize_t;
  *     PyString_FromFormat
  *     PyErr_Format
  *     PyString_FromFormatV
+ *     PyUnicode_FromFormatV
  *
  * Lower-level uses require that you interpolate the correct format modifier
  * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 0d4b755fb8ba937d051c900a337473cc29632e0a..ed2e475fb97c0f38bd18f4948167b21af3b7e138 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -350,7 +350,7 @@ complex_str(PyComplexObject *v)
 {
        char buf[100];
        complex_to_buf(buf, sizeof(buf), v, PREC_STR);
-       return PyString_FromString(buf);
+       return PyUnicode_FromString(buf);
 }
 
 static long

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 679e93eb486fc73321e006c3c3bfcaedb34d0500..b9968637c0b0ace97fd19bc9d1db8ff44395511b 100644 (file)
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -310,7 +310,7 @@ float_str(PyFloatObject *v)
 {
        char buf[100];
        format_float(buf, sizeof(buf), v, PREC_STR);
-       return PyString_FromString(buf);
+       return PyUnicode_FromString(buf);
 }
 
 /* Comparison is pretty much a nightmare.  When comparing float to float,