traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add #ifdef PY_USING_UNICODE sections, so that 

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

Fixes SF bug http://www.python.org/sf/554912
This commit is contained in:
Walter Dörwald 2002-05-13 09:00:41 +00:00
parent 87f59eeb0a
commit 775c11f07a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/stringobject.c
View File

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