Backed out the unistr() builtin.
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index 693fe60..7c65bec 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -693,13 +693,6 @@
\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
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 66372da..e5db11e 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1936,23 +1936,6 @@
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)
{
PyObject *v;
@@ -2267,7 +2250,6 @@
{"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},