Mercurial > cpython-lru_cache-weakref
diff Objects/stringobject.c @ 23431:ab52312f82c7 2.2
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
| author | Walter Dörwald <walter@livinglogic.de> |
|---|---|
| date | Mon, 13 May 2002 09:11:44 +0000 |
| parents | 01765d30532e |
| children | 608735dd2ebc |
line wrap: on
line diff
--- a/Objects/stringobject.c Mon May 13 07:55:24 2002 +0000 +++ b/Objects/stringobject.c Mon May 13 09:11:44 2002 +0000 @@ -1489,6 +1489,7 @@ 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 @@ 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; }