Removed merge glitch from stringlib/find.h as explained on the python committers list. The FROM_BYTEARRAY isn't required here.

tiran · tiran · commit 4f3c5616ccb8 · 2008-08-28T14:55:10.000Z
This also fixes bug python#3713
diff --git a/Objects/stringlib/find.h b/Objects/stringlib/find.h
@@ -90,7 +90,7 @@ stringlib_rfind_slice(const STRINGLIB_CHAR* str, Py_ssize_t str_len,
     return stringlib_rfind(str + start, end - start, sub, sub_len, start);
 }
 
-#ifdef STRINGLIB_WANT_CONTAINS_OBJ && !defined(FROM_BYTEARRAY)
+#ifdef STRINGLIB_WANT_CONTAINS_OBJ
 
 Py_LOCAL_INLINE(int)
 stringlib_contains_obj(PyObject* str, PyObject* sub)

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ stringlib_rfind_slice(const STRINGLIB_CHAR* str, Py_ssize_t str_len,`
`90`	`90`	`return stringlib_rfind(str + start, end - start, sub, sub_len, start);`
`91`	`91`	`}`
`92`	`92`
`93`		`-#ifdef STRINGLIB_WANT_CONTAINS_OBJ && !defined(FROM_BYTEARRAY)`
	`93`	`+#ifdef STRINGLIB_WANT_CONTAINS_OBJ`
`94`	`94`
`95`	`95`	`Py_LOCAL_INLINE(int)`
`96`	`96`	`stringlib_contains_obj(PyObject* str, PyObject* sub)`