summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-04-06 08:17:41 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-04-06 08:17:41 (GMT)
commit7e957d38b7b83f3cd844aac735e691eb5e1c2933 (patch)
tree5fed1e079421e1f8b687666233d80ac1a7f73029 /Objects
parentffb0d90a6ee9dbf6d8b738c4ae1c5415a2f9a628 (diff)
downloadcpython-7e957d38b7b83f3cd844aac735e691eb5e1c2933.zip
cpython-7e957d38b7b83f3cd844aac735e691eb5e1c2933.tar.gz
cpython-7e957d38b7b83f3cd844aac735e691eb5e1c2933.tar.bz2
Remove dead code (reported by HP compiler).
Can probably be backported if anyone cares.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/stringobject.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 3e3f1a9..e2b9a7b 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1952,17 +1952,14 @@ do_argstrip(PyStringObject *self, int striptype, PyObject *args)
return res;
}
#endif
- else {
- PyErr_Format(PyExc_TypeError,
+ PyErr_Format(PyExc_TypeError,
#ifdef Py_USING_UNICODE
- "%s arg must be None, str or unicode",
+ "%s arg must be None, str or unicode",
#else
- "%s arg must be None or str",
+ "%s arg must be None or str",
#endif
- STRIPNAME(striptype));
- return NULL;
- }
- return do_xstrip(self, striptype, sep);
+ STRIPNAME(striptype));
+ return NULL;
}
return do_strip(self, striptype);