diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2002-05-13 09:00:41 +0000 |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2002-05-13 09:00:41 +0000 |
| commit | 627f135402f56af87ec1a8d3c0112a82e058867d (patch) | |
| tree | da897d5f670f598c4409e668fcdf61474ea72a1a /Objects/stringobject.c | |
| parent | bb0ff6342cb50bffbeea82178a3276f022b412de (diff) | |
| download | cpython-627f135402f56af87ec1a8d3c0112a82e058867d.tar.gz | |
Add #ifdef PY_USING_UNICODE sections, so that
stringobject.c compiles again with --disable-unicode.
Fixes SF bug http://www.python.org/sf/554912
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 5bad04e552..6c18addcaf 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -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; } |