[Zope3-checkins] CVS: Zope3/src/zope/app/container - configure.zcml:1.25 dependency.py:1.13 find.py:1.11 interfaces.py:1.2

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/container
In directory cvs.zope.org:/tmp/cvs-serv11506/src/zope/app/container

Modified Files:
	configure.zcml dependency.py find.py interfaces.py 
Log Message:


Move find interfaces to zope.app.container.interfaces.


=== Zope3/src/zope/app/container/configure.zcml 1.24 => 1.25 ===
--- Zope3/src/zope/app/container/configure.zcml:1.24	Sat Mar 13 16:03:08 2004
+++ Zope3/src/zope/app/container/configure.zcml	Sat Mar 13 17:02:15 2004
@@ -7,20 +7,20 @@
    >
 
   <adapter
-     provides="zope.app.interfaces.find.IFind"
-     for="zope.app.container.interfaces.IReadContainer"
+     provides=".interfaces.IFind"
+     for=".interfaces.IReadContainer"
      permission="zope.ManageContent"
      factory="zope.app.container.find.FindAdapter"
      />
 
   <adapter
-      for="zope.app.container.interfaces.IReadContainer"
+      for=".interfaces.IReadContainer"
       provides="zope.app.interfaces.file.IReadDirectory"
       factory=".directory.noop"
       />
 
   <adapter
-      for="zope.app.container.interfaces.IWriteContainer"
+      for=".interfaces.IWriteContainer"
       provides="zope.app.interfaces.file.IWriteDirectory"
       factory=".directory.noop"
       />
@@ -39,7 +39,7 @@
       />
 
   <adapter
-      provides="zope.app.container.interfaces.INameChooser"
+      provides=".interfaces.INameChooser"
       for="zope.app.container.interfaces.IWriteContainer"
       factory=".contained.NameChooser"
       />


=== Zope3/src/zope/app/container/dependency.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/container/dependency.py:1.12	Sat Mar  6 12:48:47 2004
+++ Zope3/src/zope/app/container/dependency.py	Sat Mar 13 17:02:15 2004
@@ -19,8 +19,7 @@
 from zope.interface import implements
 
 from zope.app import zapi
-from zope.app.interfaces.dependable import IDependable
-from zope.app.interfaces.dependable import DependencyError
+from zope.app.dependable.interfaces import IDependable, DependencyError
 from zope.app.event.interfaces import ISubscriber
 
 class DependencyChecker:


=== Zope3/src/zope/app/container/find.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/container/find.py:1.10	Fri Mar  5 17:08:59 2004
+++ Zope3/src/zope/app/container/find.py	Sat Mar 13 17:02:15 2004
@@ -15,10 +15,9 @@
 
 $Id$
 """
-
-from zope.app.interfaces.find import IFind, IIdFindFilter
-from zope.app.container.interfaces import IReadContainer
 from zope.interface import implements
+from interfaces import IFind, IIdFindFilter
+from interfaces import IReadContainer
 
 class FindAdapter(object):
 


=== Zope3/src/zope/app/container/interfaces.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/container/interfaces.py:1.1	Wed Mar  3 05:38:39 2004
+++ Zope3/src/zope/app/container/interfaces.py	Sat Mar 13 17:02:15 2004
@@ -262,3 +262,29 @@
 
     def removeNotify(object, container):
         """Hook method will call before object is removed from container."""
+
+
+##############################################################################
+# Finding objects
+
+class IFind(Interface):
+    """
+    Find support for containers.
+    """
+
+    def find(id_filters=None, object_filters=None):
+        """Find object that matches all filters in all sub objects,
+        not including this container itself.
+        """
+
+class IObjectFindFilter(Interface):
+
+    def matches(object):
+        """Returns true if the object matches the filter criteria.
+        """
+
+class IIdFindFilter(Interface):
+
+    def matches(id):
+        """Returns true if the id matches the filter criteria.
+        """