Backed out the unistr() builtin.

Doc/lib/libfuncs.tex

@@ -693,13 +693,6 @@ to decode UTF-8 in strict mode, meaning that encoding errors raise
 \versionadded{2.0}
 \end{funcdesc}
 
-\begin{funcdesc}{unistr}{object}
-Return a Unicode string containing a nicely printable representation
-of an object.  For Unicode, this returns the Unicode string itself.
-For all other objects, it tries to convert \code{str(\var{object})} to
-Unicode.
-\end{funcdesc}
-
 \begin{funcdesc}{vars}{\optional{object}}
 Without arguments, return a dictionary corresponding to the current
 local symbol table.  With a module, class or class instance object as

Python/bltinmodule.c

@@ -1935,23 +1935,6 @@ Return a nice string representation of the object.\n\
 If the argument is a string, the return value is the same object.";
 
 
-static PyObject *
-builtin_unistr(PyObject *self, PyObject *args)
-{
-	PyObject *v;
-
-	if (!PyArg_ParseTuple(args, "O:unistr", &v))
-		return NULL;
-	return PyObject_Unicode(v);
-}
-
-static char unistr_doc[] =
-"unistr(object) -> unicode\n\
-\n\
-Return a nice unicode representation of the object.\n\
-If the argument is a unicode, the return value is the same object.";
-
-
 static PyObject *
 builtin_tuple(PyObject *self, PyObject *args)
 {
@@ -2267,7 +2250,6 @@ static PyMethodDef builtin_methods[] = {
 	{"type",	builtin_type, 1, type_doc},
 	{"unicode",	builtin_unicode, 1, unicode_doc},
 	{"unichr",	builtin_unichr, 1, unichr_doc},
-	{"unistr",	builtin_unistr, 1, unistr_doc},
 	{"vars",	builtin_vars, 1, vars_doc},
 	{"xrange",	builtin_xrange, 1, xrange_doc},
  	{"zip",         builtin_zip, 1, zip_doc},