[Zope3-checkins] CVS: Zope3/src/zope/app/process - bootstrap.py:1.8.2.2

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	bootstrap.py 
Log Message:
merged Folder and RootFolder

=== Zope3/src/zope/app/process/bootstrap.py 1.8.2.1 => 1.8.2.2 ===
--- Zope3/src/zope/app/process/bootstrap.py:1.8.2.1	Fri Sep 12 15:15:31 2003
+++ Zope3/src/zope/app/process/bootstrap.py	Fri Sep 12 16:46:27 2003
@@ -26,7 +26,7 @@
 from zope.app.interfaces.event import ISubscriber
 from zope.app.traversing import traverse, traverseName
 from zope.app.publication.zopepublication import ZopePublication
-from zope.app.content.folder import RootFolder
+from zope.app.content.folder import rootFolder
 from zope.app.services.servicenames import HubIds, PrincipalAnnotation
 from zope.app.services.servicenames import EventPublication, EventSubscription
 from zope.app.services.servicenames import ErrorLogging, Interfaces
@@ -69,7 +69,7 @@
 
         if self.root_folder is None:
             self.root_created = True
-            self.root_folder = RootFolder()
+            self.root_folder = rootFolder()
             root[ZopePublication.root_name] = self.root_folder
 
         try: