From: Neal Norwitz <nnorwitz@gmail.com>
Date: Thu, 6 Apr 2006 08:17:41 +0000 (+0000)
Subject: Remove dead code (reported by HP compiler).
X-Git-Tag: v2.5a2~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e957d38b7b83f3cd844aac735e691eb5e1c2933;p=thirdparty%2FPython%2Fcpython.git

Remove dead code (reported by HP compiler).

Can probably be backported if anyone cares.
---

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 3e3f1a963ad7..e2b9a7bf023a 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);