[Python-checkins] r52216 - python/branches/release24-maint/Objects/stringobject.c

Fri Oct 6 21:26:14 CEST 2006

Author: andrew.kuchling
Date: Fri Oct 6 21:26:14 2006
New Revision: 52216
Modified:
 python/branches/release24-maint/Objects/stringobject.c
Log:
[Backport r43695 | neal.norwitz]
Remove dead code (reported by HP compiler).
Can probably be backported if anyone cares.
Modified: python/branches/release24-maint/Objects/stringobject.c
==============================================================================

--- python/branches/release24-maint/Objects/stringobject.c	(original)
+++ python/branches/release24-maint/Objects/stringobject.c	Fri Oct 6 21:26:14 2006
@@ -1926,17 +1926,14 @@
 			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);
