[Python-3000-checkins] r66055 - python/branches/py3k/Objects/stringlib/find.h

[christian.heimes]

Author: christian.heimes
Date: Thu Aug 28 16:55:10 2008
New Revision: 66055

Log:
Removed merge glitch from stringlib/find.h as explained on the python committers list. The FROM_BYTEARRAY isn't required here.
This also fixes bug #3713

Modified:
python/branches/py3k/Objects/stringlib/find.h

Modified: python/branches/py3k/Objects/stringlib/find.h
==============================================================================
--- python/branches/py3k/Objects/stringlib/find.h (original)
+++ python/branches/py3k/Objects/stringlib/find.h Thu Aug 28 16:55:10 2008
@@ -90,7 +90,7 @@
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)