Commit 627f1354 authored by Walter Dörwald's avatar Walter Dörwald

Add #ifdef PY_USING_UNICODE sections, so that

stringobject.c compiles again with --disable-unicode.

Fixes SF bug http://www.python.org/sf/554912
parent bb0ff634
......@@ -1457,6 +1457,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;
......@@ -1467,9 +1468,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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment