use cybertools.catalog for queries instead of hurry.query

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2557 fd906abe-77d9-0310-91a1-e0d9ade77398

expert/README.txt

@@ -7,9 +7,6 @@ use of it.
 
   ($Id$)
 
-The query stuff depends on hurry.query, see
-http://cheeseshop.python.org/pypi/hurry.query
-
 
 Setting up a loops Site and Utilities
 =====================================

expert/filter.py

@@ -22,10 +22,10 @@ Filter query results.
 $Id$
 """
 
-from hurry.query.query import And
 from BTrees.IOBTree import IOBTree
 from zope.interface import implements
 
+from cybertools.catalog.query import And
 from loops.expert.interfaces import IFilter
 from loops.expert.query import Children as ChildrenQuery
 

expert/query.py

@@ -30,10 +30,9 @@ from zope.app.intid.interfaces import IIntIds
 from zope.component import adapts
 from zope.interface import implements, implementer
 from zope.cachedescriptors.property import Lazy
-from hurry.query.query import Term
-from hurry.query.query import Text as BaseText
-from hurry.query.query import Eq, Between
 
+from cybertools.catalog.query import Term, Eq, Between
+from cybertools.catalog.query import Text as BaseText
 from loops.expert.interfaces import IQuery
 from loops.security.common import canListObject
 from loops import util