]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[Backport r43695 | neal.norwitz]
authorAndrew M. Kuchling <amk@amk.ca>
Fri, 6 Oct 2006 19:26:14 +0000 (19:26 +0000)
committerAndrew M. Kuchling <amk@amk.ca>
Fri, 6 Oct 2006 19:26:14 +0000 (19:26 +0000)
Remove dead code (reported by HP compiler).

Can probably be backported if anyone cares.

Objects/stringobject.c

index 9abd6dcf5249ed3e0ac6c9f52abecd372b7826d5..7395010e1629c7e272f4a8ae91b857c8b9fce4fd 100644 (file)
@@ -1926,17 +1926,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);