Replace PyObject_Unicode with PyObject_Str everywhere, and remove the

#define for PyObject_Unicode in object.h.

diff --git a/Include/object.h b/Include/object.h
index e96e6a7a3c6aefdf9194b6c8b0128eb0b6da5264..b5ed054a30ab180f00e982d2bc9d4837711a9a4e 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -432,7 +432,6 @@ PyAPI_FUNC(void) _Py_BreakPoint(void);
 PyAPI_FUNC(void) _PyObject_Dump(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
-#define PyObject_Unicode PyObject_Str /* Compatibility */
 PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
 PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 2ebbf38d5c1d9590649df938f426bf860bda8d7a..10cf96f6b034c74cbd86e24541829b4a20495329 100644 (file)
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -1185,7 +1185,7 @@ csv_writerow(WriterObj *self, PyObject *seq)
                else {
                        PyObject *str;
 
-                       str = PyObject_Unicode(field);
+                       str = PyObject_Str(field);
                        Py_DECREF(field);
                        if (str == NULL)
                                return NULL;

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 69129f7a5b761a18b3f3d2df8aa0aa0dbb1b68a0..1ab1d27cb0a4aa35a53b4b24d8814a366ad2c936 100644 (file)
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -785,7 +785,7 @@ void Extend_Error_Info(PyObject *exc_class, char *fmt, ...)
                        goto error;
        } else
                PyErr_Clear();
-       msg_str = PyObject_Unicode(v);
+       msg_str = PyObject_Str(v);
        if (msg_str)
                PyUnicode_AppendAndDel(&s, msg_str);
        else {

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index cb33e8523b692bd968e55107d265d2b1d9fb1ea6..9b67b5ec835add83692d78d783d4add7e52ff620 100644 (file)
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -615,12 +615,12 @@ test_long_numbits(PyObject *self)
        return Py_None;
 }
 
-/* Example passing NULLs to PyObject_Str(NULL) and PyObject_Unicode(NULL). */
+/* Example passing NULLs to PyObject_Str(NULL). */
 
 static PyObject *
 test_null_strings(PyObject *self)
 {
-       PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Unicode(NULL);
+       PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Str(NULL);
        PyObject *tuple = PyTuple_Pack(2, o1, o2);
        Py_XDECREF(o1);
        Py_XDECREF(o2);

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 701b112332d83eba157037c27d420b377c991ffb..3e4e22d03216676c9d171cfd97ef93d29e83485a 100644 (file)
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -552,7 +552,7 @@ MultibyteCodec_Encode(MultibyteCodecObject *self,
        if (PyUnicode_Check(arg))
                ucvt = NULL;
        else {
-               arg = ucvt = PyObject_Unicode(arg);
+               arg = ucvt = PyObject_Str(arg);
                if (arg == NULL)
                        return NULL;
                else if (!PyUnicode_Check(arg)) {
@@ -728,7 +728,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
        if (PyUnicode_Check(unistr))
                ucvt = NULL;
        else {
-               unistr = ucvt = PyObject_Unicode(unistr);
+               unistr = ucvt = PyObject_Str(unistr);
                if (unistr == NULL)
                        return NULL;
                else if (!PyUnicode_Check(unistr)) {

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 9342b19bfbdafc13fc04290f0d196176882c73ce..bacc9ef491f911161d0e6bb1426c9fa3700de97f 100644 (file)
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -2444,7 +2444,7 @@ date_format(PyDateTime_Date *self, PyObject *args)
 
        /* if the format is zero length, return str(self) */
        if (PyUnicode_GetSize(format) == 0)
-                return PyObject_Unicode((PyObject *)self);
+                return PyObject_Str((PyObject *)self);
 
         return PyObject_CallMethod((PyObject *)self, "strftime", "O", format);
 }
@@ -3220,7 +3220,7 @@ time_format(PyDateTime_Time *self, PyObject *args)
 
        /* if the format is zero length, return str(self) */
        if (PyUnicode_GetSize(format) == 0)
-                return PyObject_Unicode((PyObject *)self);
+                return PyObject_Str((PyObject *)self);
 
         return PyObject_CallMethod((PyObject *)self, "strftime", "O", format);
 }

diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index 853f0f6e2772b6153f0ccd326e924dbd350e73ce..7e479250ce9276fe069a38ae599ae6e87b9ccd70 100644 (file)
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -110,7 +110,7 @@ grp_getgrnam(PyObject *self, PyObject *pyo_name)
     char *name;
     struct group *p;
 
-    py_str_name = PyObject_Unicode(pyo_name);
+    py_str_name = PyObject_Str(pyo_name);
     if (!py_str_name)
            return NULL;
     name = PyUnicode_AsString(py_str_name);

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 6ef765b2cadaa3ee97fe85ee7a5e8251410b8a9f..e26c35041c1ec65df336b907deb09c0ee1ef5988 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -89,9 +89,9 @@ BaseException_str(PyBaseExceptionObject *self)
     case 0:
         return PyUnicode_FromString("");
     case 1:
-        return PyObject_Unicode(PyTuple_GET_ITEM(self->args, 0));
+        return PyObject_Str(PyTuple_GET_ITEM(self->args, 0));
     default:
-        return PyObject_Unicode(self->args);
+        return PyObject_Str(self->args);
     }
 }
 
@@ -939,7 +939,7 @@ SyntaxError_str(PySyntaxErrorObject *self)
     have_lineno = (self->lineno != NULL) && PyInt_CheckExact(self->lineno);
 
     if (!filename && !have_lineno)
-        return PyObject_Unicode(self->msg ? self->msg : Py_None);
+        return PyObject_Str(self->msg ? self->msg : Py_None);
 
     if (filename && have_lineno)
         return PyUnicode_FromFormat("%S (%s, line %ld)",

diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index 6c3c1e606aac322028c16dc056b3600b5bf91e95..b77114957c375230f130a9e706fa1b26fe355c6e 100644 (file)
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -770,7 +770,7 @@ do_conversion(PyObject *obj, STRINGLIB_CHAR conversion)
     case 'r':
         return PyObject_Repr(obj);
     case 's':
-        return PyObject_Unicode(obj);
+        return PyObject_Str(obj);
     default:
         PyErr_Format(PyExc_ValueError,
                      "Unknown converion specifier %c",

diff --git a/Objects/stringlib/unicodedefs.h b/Objects/stringlib/unicodedefs.h
index fa6140f22400a61a37b2356cc4e1cf70b340fd2a..64777bef3fe903d3fa27030426220f6f77e623d3 100644 (file)
--- a/Objects/stringlib/unicodedefs.h
+++ b/Objects/stringlib/unicodedefs.h
@@ -20,7 +20,7 @@
 #define STRINGLIB_NEW            PyUnicode_FromUnicode
 #define STRINGLIB_RESIZE         PyUnicode_Resize
 #define STRINGLIB_CHECK          PyUnicode_Check
-#define STRINGLIB_TOSTR          PyObject_Unicode
+#define STRINGLIB_TOSTR          PyObject_Str
 
 #define STRINGLIB_WANT_CONTAINS_OBJ 1
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 4266a7cd090d740bf122298d6c44c82e267c0bb0..fd6f5ce2b6c95f47026c28d2b28282cd8929249c 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2954,7 +2954,7 @@ object_format(PyObject *self, PyObject *args)
                 return NULL;
         }
 
-        self_as_str = PyObject_Unicode(self);
+        self_as_str = PyObject_Str(self);
         if (self_as_str != NULL) {
                 /* find the format function */
                 format_meth = PyObject_GetAttrString(self_as_str, "__format__");

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ae34c9e589ecc44dd335e4b792be0c2e55965ada..a011a9af5fd1d4249c4676a0e6ecefb3823a064c 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -572,14 +572,14 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
 #endif
 #endif
        /* step 1: count the number of %S/%R format specifications
-        * (we call PyObject_Unicode()/PyObject_Repr() for these objects
+        * (we call PyObject_Str()/PyObject_Repr() for these objects
         * once during step 3 and put the result in an array) */
        for (f = format; *f; f++) {
                if (*f == '%' && (*(f+1)=='S' || *(f+1)=='R'))
                        ++callcount;
        }
        /* step 2: allocate memory for the results of
-        * PyObject_Unicode()/PyObject_Repr() calls */
+        * PyObject_Str()/PyObject_Repr() calls */
        if (callcount) {
                callresults = PyMem_Malloc(sizeof(PyObject *)*callcount);
                if (!callresults) {
@@ -683,7 +683,7 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
                                PyObject *obj = va_arg(count, PyObject *);
                                PyObject *str;
                                assert(obj);
-                               str = PyObject_Unicode(obj);
+                               str = PyObject_Str(obj);
                                if (!str)
                                        goto fail;
                                n += PyUnicode_GET_SIZE(str);
@@ -987,7 +987,7 @@ PyObject *PyUnicode_FromOrdinal(int ordinal)
 PyObject *PyUnicode_FromObject(register PyObject *obj)
 {
     /* XXX Perhaps we should make this API an alias of
-           PyObject_Unicode() instead ?! */
+           PyObject_Str() instead ?! */
     if (PyUnicode_CheckExact(obj)) {
        Py_INCREF(obj);
        return obj;
@@ -8671,7 +8671,7 @@ PyObject *PyUnicode_Format(PyObject *format,
                else {
                    PyObject *unicode;
                    if (c == 's')
-                       temp = PyObject_Unicode(v);
+                       temp = PyObject_Str(v);
                    else
                        temp = PyObject_Repr(v);
                    if (temp == NULL)
@@ -8889,7 +8889,7 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        if (x == NULL)
                return (PyObject *)_PyUnicode_New(0);
        if (encoding == NULL && errors == NULL)
-           return PyObject_Unicode(x);
+           return PyObject_Str(x);
        else
        return PyUnicode_FromEncodedObject(x, encoding, errors);
 }

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 86439517ca053b571bc490cc13799fa8564839a0..0ba8646ab5d2fcbff62f91d513922ecff96fa8c0 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -911,7 +911,7 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
        }
        v = PySys_GetObject("ps1");
        if (v != NULL) {
-               v = PyObject_Unicode(v);
+               v = PyObject_Str(v);
                if (v == NULL)
                        PyErr_Clear();
                else if (PyUnicode_Check(v))
@@ -919,7 +919,7 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
        }
        w = PySys_GetObject("ps2");
        if (w != NULL) {
-               w = PyObject_Unicode(w);
+               w = PyObject_Str(w);
                if (w == NULL)
                        PyErr_Clear();
                else if (PyUnicode_Check(w))
@@ -1373,7 +1373,7 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
                else
                        err = PyFile_WriteObject(exception, f, Py_PRINT_RAW);
                if (err == 0 && (value != Py_None)) {
-                       PyObject *s = PyObject_Unicode(value);
+                       PyObject *s = PyObject_Str(value);
                        /* only print colon if the str() of the
                           object is not the empty string
                        */
@@ -1687,7 +1687,7 @@ err_input(perrdetail *err)
                PyObject *type, *value, *tb;
                PyErr_Fetch(&type, &value, &tb);
                if (value != NULL) {
-                       u = PyObject_Unicode(value);
+                       u = PyObject_Str(value);
                        if (u != NULL) {
                                msg = PyUnicode_AsString(u);
                        }