[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container - IZopeContainer.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Container
In directory cvs.zope.org:/tmp/cvs-serv24308/lib/python/Zope/App/OFS/Container

Modified Files:
	IZopeContainer.py 
Log Message:
Redid the specifications so that the interfaces here extend the
corresponding interfaces in IContainer.


=== Zope3/lib/python/Zope/App/OFS/Container/IZopeContainer.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/OFS/Container/IZopeContainer.py:1.2	Mon Nov 18 18:52:58 2002
+++ Zope3/lib/python/Zope/App/OFS/Container/IZopeContainer.py	Tue Nov 19 09:45:54 2002
@@ -15,11 +15,9 @@
 $Id$
 """
 
+import IContainer
 
-from Interface import Interface
-from Interface.Common.Mapping import IReadMapping, IEnumerableMapping
-
-class IZopeItemContainer(Interface):
+class IZopeItemContainer(IContainer.IItemContainer):
 
     def __getitem__(key):
         """Return the content for the given key
@@ -31,7 +29,8 @@
         
 
 
-class IZopeSimpleReadContainer(IZopeItemContainer, IReadMapping):
+class IZopeSimpleReadContainer(IZopeItemContainer,
+                               IContainer.ISimpleReadContainer):
     """Readable content containers
     """
 
@@ -45,7 +44,7 @@
         
     
 
-class IZopeReadContainer(IZopeSimpleReadContainer, IEnumerableMapping):
+class IZopeReadContainer(IZopeSimpleReadContainer, IContainer.IReadContainer):
     """Readable containers that can be enumerated.
     """
 
@@ -62,7 +61,7 @@
 
     
 
-class IZopeWriteContainer(Interface):
+class IZopeWriteContainer(IContainer.IWriteContainer):
     """An interface for the write aspects of a container."""
 
     def setObject(key, object):
@@ -101,6 +100,6 @@
         is published. The event object will be the container.
         """
 
-class IZopeContainer(IZopeReadContainer, IZopeWriteContainer):
+class IZopeContainer(IZopeReadContainer, IContainer.IContainer):
     """Readable and writable content container."""