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

[Christian Theune]

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

Modified Files:
      Tag: ctheune-services_move-branch
	PlacefulSetup.py testServiceManager.py 
Log Message:
Move of ServiceManager Part 3
(Rewriting all import statements and references to the modules) 


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/tests/PlacefulSetup.py 1.1.2.1 => 1.1.2.2 ===
         self.__old_getServiceManager_hook=CA.getServiceManager_hook
         self.__old_getNextServiceManager_hook=CA.getNextServiceManager_hook
-        from Zope.App.OFS.ServiceManager import hooks
+        from Zope.App.OFS.Services.ServiceManager import hooks
         CA.getServiceManager_hook=hooks.getServiceManager_hook
         CA.getNextServiceManager_hook=hooks.getNextServiceManager_hook
 
@@ -87,7 +87,7 @@
 
     def createServiceManager(self, folder=None):
         if folder is None: folder=self.rootFolder
-        from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
+        from Zope.App.OFS.Services.ServiceManager.ServiceManager import ServiceManager
         folder.setServiceManager(ServiceManager())
 
     def tearDown(self):


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/tests/testServiceManager.py 1.1.2.1 => 1.1.2.2 ===
 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.App.OFS.Services.ServiceManager.ServiceManager import ServiceManager
 from Zope.ComponentArchitecture import getService, getServiceManager
 from Zope.Exceptions import ZopeError
 from PlacefulSetup import PlacefulSetup