[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ServiceManager/tests - PlacefulSetup.py:1.1.2.3 testServiceManager.py:1.1.2.10

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ServiceManager/tests
In directory cvs.zope.org:/tmp/cvs-serv3937/lib/python/Zope/App/OFS/ServiceManager/tests

Modified Files:
      Tag: Zope-3x-branch
	PlacefulSetup.py testServiceManager.py 
Log Message:
Completing OFS.Folder -> OFS.Content.Folder by merging 'ctheune-foldermove-branch' into Zope-3x-branch

=== Zope3/lib/python/Zope/App/OFS/ServiceManager/tests/PlacefulSetup.py 1.1.2.2 => 1.1.2.3 ===
         #   |           \            |            |
         # folder1_1_1 folder1_1_2  folder1_2_1  folder2_1_1
-        from Zope.App.OFS.Folder.Folder import Folder
-        from Zope.App.OFS.Folder.RootFolder import RootFolder
+        from Zope.App.OFS.Content.Folder.Folder import Folder
+        from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
         from Zope.Proxy.ContextWrapper import ContextWrapper
         # top
         self.rootFolder=RootFolder()


=== Zope3/lib/python/Zope/App/OFS/ServiceManager/tests/testServiceManager.py 1.1.2.9 => 1.1.2.10 ===
 
 from Interface import Interface
-from Zope.App.OFS.Folder.RootFolder import RootFolder
-from Zope.App.OFS.Folder.Folder import Folder
+from Zope.App.OFS.Content.Folder.RootFolder import RootFolder
+from Zope.App.OFS.Content.Folder.Folder import Folder
 from Zope.Proxy.ContextWrapper import getWrapperContext
 from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
 from Zope.ComponentArchitecture import getService, getServiceManager