[Zope-CVS] CVS: Packages/pypes/pypes - query.py:1.21

[Casey Duncan]

Update of /cvs-repository/Packages/pypes/pypes
In directory cvs.zope.org:/tmp/cvs-serv14841/pypes

Modified Files:
	query.py 
Log Message:
Fix failing str and repr test for expressions
Replace deprecated zope.interface.isImplemented by with providedBy


=== Packages/pypes/pypes/query.py 1.20 => 1.21 ===
--- Packages/pypes/pypes/query.py:1.20	Thu Jul  1 23:18:56 2004
+++ Packages/pypes/pypes/query.py	Sat Nov 27 17:17:50 2004
@@ -79,7 +79,7 @@
     
     def _cache_results(self):
         """Evaluate the query results and cache results and length"""
-        if IActualizedPartialResult.isImplementedBy(self._partial_result):
+        if IActualizedPartialResult.providedBy(self._partial_result):
             self._len_cache = len(self._partial_result)
             # No need to cache actualized result
             self._result_cache = None
@@ -163,7 +163,7 @@
         inputs -- A named set, a sequence of named sets, or a mapping of
         input names to sets.
         """
-        if ISet.isImplementedBy(inputs) or isinstance(inputs, Set):
+        if ISet.providedBy(inputs) or isinstance(inputs, Set):
             inputs = (inputs,)
         if hasattr(inputs, 'items') and hasattr(inputs, 'keys'):
             # Mapping of input names to inputs
@@ -203,7 +203,7 @@
             if limit < 1:
                 raise QueryInputError('limit must be 1 or greater')
             self.limit = limit
-        if IOrderExpression.isImplementedBy(order):
+        if IOrderExpression.providedBy(order):
             self.order = (order,)
         else:
             # XXX Should we try to test for sequence-ness?