Backport checkin:

Add #ifdef PY_USING_UNICODE sections, so that
stringobject.c compiles again with --disable-unicode.

Fixes SF bug http://www.python.org/sf/554912

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 00f5d986a2629b3e2f21e9ea8f4a0bcf76363ac8..dd74569fda47ddc60ceff72e4ed6c35be246f06a 100644 (file)
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1489,6 +1489,7 @@ do_argstrip(PyStringObject *self, int striptype, PyObject *args)
        if (sep != NULL && sep != Py_None) {
                if (PyString_Check(sep))
                        return do_xstrip(self, striptype, sep);
+#ifdef Py_USING_UNICODE
                else if (PyUnicode_Check(sep)) {
                        PyObject *uniself = PyUnicode_FromObject((PyObject *)self);
                        PyObject *res;
@@ -1499,9 +1500,14 @@ do_argstrip(PyStringObject *self, int striptype, PyObject *args)
                        Py_DECREF(uniself);
                        return res;
                }
+#endif
                else {
                        PyErr_Format(PyExc_TypeError,
+#ifdef Py_USING_UNICODE
                                     "%s arg must be None, str or unicode",
+#else
+                                    "%s arg must be None or str",
+#endif
                                     STRIPNAME(striptype));
                        return NULL;
                }