]> granicus.if.org Git - python/commitdiff
Remove dead code (reported by HP compiler).
authorNeal Norwitz <nnorwitz@gmail.com>
Thu, 6 Apr 2006 08:17:41 +0000 (08:17 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Thu, 6 Apr 2006 08:17:41 +0000 (08:17 +0000)
Can probably be backported if anyone cares.

Objects/stringobject.c

index 3e3f1a963ad7fd6c7d2761b44c1b3200cbb7e8af..e2b9a7bf023aa532a4eae223a3cdd2c62ef680b9 100644 (file)
@@ -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);