[Zope-Checkins] CVS: Zope2 - GlobbingLexicon.py:1.4.46.5

chrism@serenade.digicool.com chrism@serenade.digicool.com
Mon, 2 Apr 2001 14:17:56 -0400


Update of /cvs-repository/Zope2/lib/python/SearchIndex
In directory serenade.digicool.com:/home/chrism/sandboxes/2_3Branch/lib/python/SearchIndex

Modified Files:
      Tag: zope-2_3-branch
	GlobbingLexicon.py 
Log Message:
Fix for "TypeError:  expected integer key" error (Collector 2121)


--- Updated File GlobbingLexicon.py in package Zope2 --
--- GlobbingLexicon.py	2001/03/27 23:42:36	1.4.46.4
+++ GlobbingLexicon.py	2001/04/02 18:17:43	1.4.46.5
@@ -231,7 +231,9 @@
                     digrams.append( (pattern[i] + self.eow) )
 
         if not globbing:
-            result =  self._lexicon.get(pattern, ())
+            result =  self._lexicon.get(pattern, None)
+            if result is None:
+                return ()
             return (result, )
         
         ## now get all of the intsets that contain the result digrams