Backported c109102 from 2.12 branch

zopefoundation · Feb 22, 2010 · dea3a25 · dea3a25
1 parent 62b5578
commit dea3a25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
@@ -8,6 +8,8 @@ Zope Changes
 
     Bugs Fixed
 
+      - Protect ZCTextIndex's clear method against storing Acquisition wrappers.
+
       - LP #195761: fixed ZMI XML export / import.
 
       - MailHost should fall back to HELO when EHLO fails.

diff --git a/lib/python/Products/ZCTextIndex/ZCTextIndex.py b/lib/python/Products/ZCTextIndex/ZCTextIndex.py
@@ -253,7 +253,7 @@ def clear(self):
             del self._v_lexicon
         except (AttributeError, KeyError):
             pass
-        self.index = self._index_factory(self.getLexicon())
+        self.index = self._index_factory(aq_base(self.getLexicon()))
 
     ## User Interface Methods ##