Commit a7daace8 authored by Anthony Baxter's avatar Anthony Baxter

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 :)
parent c272e591
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
############################################################################## ##############################################################################
__doc__="""Find support""" __doc__="""Find support"""
__version__='$Revision: 1.31 $'[11:-2] __version__='$Revision: 1.32 $'[11:-2]
import sys, os, time, Globals, ExtensionClass import sys, os, time, Globals, ExtensionClass
...@@ -114,7 +114,7 @@ class FindSupport(ExtensionClass.Base): ...@@ -114,7 +114,7 @@ class FindSupport(ExtensionClass.Base):
and and
(not obj_searchterm or (not obj_searchterm or
(hasattr(ob, 'PrincipiaSearchSource') and (hasattr(ob, 'PrincipiaSearchSource') and
ob.PrincipiaSearchSource().find(obj_searchterm) >= 0 ob.PrincipiaSearchSource().find(str(obj_searchterm)) >= 0
)) ))
and and
(not obj_expr or expr_match(ob, obj_expr)) (not obj_expr or expr_match(ob, obj_expr))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment