[Zope3-checkins] CVS: Zope3/src/zope/app/content - folder.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	folder.py 
Log Message:
Changes needed to get placefulsetup working again (I think) and to get zope.app.traversing almost passing

=== Zope3/src/zope/app/content/folder.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/content/folder.py:1.1.2.1	Mon Dec 23 14:31:29 2002
+++ Zope3/src/zope/app/content/folder.py	Mon Dec 23 18:22:18 2002
@@ -12,33 +12,14 @@
 # 
 ##############################################################################
 
-from zope.app.interfaces.traversing.containmentroot import IContainmentRoot
-
-class IRootFolder(IFolder, IContainmentRoot):
-    """The standard Zope root Folder object interface."""
-
-
-class RootFolder(Folder):
-    """The standard Zope root Folder implementation."""
-
-    __implements__ = Folder.__implements__, IRootFolder
-
-
-from zope.app.interfaces.container import IContainer
-
-import persistence
+from zope.app.interfaces.content.folder import IFolder, IRootFolder
+from persistence import Persistent
 from zodb.btrees.OOBTree import OOBTree
-from zope.app.services.service \
-     import ServiceManagerContainer
-
-from zope.app.interfaces.services.service import \
-     IServiceManagerContainer
+from zope.app.services.service import ServiceManagerContainer
+from zope.app.interfaces.services.service import IServiceManagerContainer
 from zope.exceptions import DuplicationError
 
-class IFolder(IContainer, IServiceManagerContainer):
-    """The standard Zope Folder object interface."""
-
-class Folder(Persistence.Persistent, ServiceManagerContainer):
+class Folder(Persistent, ServiceManagerContainer):
     """The standard Zope Folder implementation."""
 
     __implements__ = IFolder
@@ -110,4 +91,10 @@
         """Delete the named object from the folder. Raises a KeyError
            if the object is not found."""
         del self.data[name]
+
+
+class RootFolder(Folder):
+    """The standard Zope root Folder implementation."""
+
+    __implements__ = Folder.__implements__, IRootFolder