From: Andrew M. Kuchling <amk@amk.ca>
Date: Fri, 6 Oct 2006 19:26:14 +0000 (+0000)
Subject: [Backport r43695 | neal.norwitz]
X-Git-Tag: v2.4.4c1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78754c13ceb37117d94a0dc203ab914c4fd1c8c4;p=thirdparty%2FPython%2Fcpython.git

[Backport r43695 | neal.norwitz]

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 9abd6dcf5249..7395010e1629 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -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);