Replace PyObject_Unicode with PyObject_Str everywhere, and remove the

#define for PyObject_Unicode in object.h.

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);

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;

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 {

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);

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)) {

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);
 }

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);

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)",

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",

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
 

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__");

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);
 }

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);
 			}