[Zope-Checkins] CVS: Zope/lib/python/OFS - FindSupport.py:1.32

[Anthony Baxter]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv11903

Modified Files:
	FindSupport.py 
Log Message:
If a find string contains a <, it's a "TaintedString", rather than
a string. This then breaks when you do a Find. Force it to be a string.
Will backport to the 2.7 branch - it should probably go into the 2.6
branch too, but I'll let someone at ZC make that call. (mmm endless beta
cycle :)


=== Zope/lib/python/OFS/FindSupport.py 1.31 => 1.32 ===
--- Zope/lib/python/OFS/FindSupport.py:1.31	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/FindSupport.py	Thu Aug 28 04:25:31 2003
@@ -114,7 +114,7 @@
                 and
                 (not obj_searchterm or
                  (hasattr(ob, 'PrincipiaSearchSource') and
-                  ob.PrincipiaSearchSource().find(obj_searchterm) >= 0
+                  ob.PrincipiaSearchSource().find(str(obj_searchterm)) >= 0
                   ))
                 and
                 (not obj_expr or expr_match(ob, obj_expr))