From: Guido van Rossum <guido@python.org>
Date: Tue, 7 Mar 2000 15:54:45 +0000 (+0000)
Subject: Patch by Moshe Zadka: remove the string special case in
X-Git-Tag: v1.6a1~263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9611e0b4620988310c15122e3d14deadb2efbb35;p=python

Patch by Moshe Zadka: remove the string special case in
PySequence_Contains() now that string objects have this code in their
tp_contains.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 739d9d9d55..970d80fa2f 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1121,24 +1121,6 @@ PySequence_Contains(w, v) /* v in w */
 	PyObject *x;
 	PySequenceMethods *sq;
 
-	/* Special case for char in string */
-	if (PyString_Check(w)) {
-		register char *s, *end;
-		register char c;
-		if (!PyString_Check(v) || PyString_Size(v) != 1) {
-			PyErr_SetString(PyExc_TypeError,
-			    "string member test needs char left operand");
-			return -1;
-		}
-		c = PyString_AsString(v)[0];
-		s = PyString_AsString(w);
-		end = s + PyString_Size(w);
-		while (s < end) {
-			if (c == *s++)
-				return 1;
-		}
-		return 0;
-	}
 	if(PyType_HasFeature(w->ob_type, Py_TPFLAGS_HAVE_SEQUENCE_IN)) {
 		sq = w->ob_type->tp_as_sequence;
 	        if(sq != NULL && sq->sq_contains != NULL)