[Zope3-checkins] CVS: Zope3/src/zope/app/tests - setup.py:1.6.2.4

[Jim Fulton]

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

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

=== Zope3/src/zope/app/tests/setup.py 1.6.2.3 => 1.6.2.4 ===
--- Zope3/src/zope/app/tests/setup.py:1.6.2.3	Fri Sep 12 15:15:37 2003
+++ Zope3/src/zope/app/tests/setup.py	Fri Sep 12 16:46:29 2003
@@ -95,7 +95,7 @@
     setUpRegistered()
 
     if site:
-        site = RootFolder()
+        site = rootFolder()
         createServiceManager(site)
         return site
 
@@ -104,7 +104,7 @@
     zope.component.getServiceManager.reset()
 
 
-from zope.app.content.folder import Folder, RootFolder
+from zope.app.content.folder import Folder, rootFolder
 
 def buildSampleFolderTree():
     # set up a reasonably complex folder structure
@@ -117,7 +117,7 @@
     #   |           \            |            |
     # folder1_1_1 folder1_1_2  folder1_2_1  folder2_1_1
 
-    root = RootFolder()
+    root = rootFolder()
     root['folder1'] = Folder()
     root['folder1']['folder1_1'] = Folder()
     root['folder1']['folder1_1']['folder1_1_1'] = Folder()