[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager - Packages.py:1.3 ServiceManager.py:1.7

[Jim Fulton]

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

Modified Files:
	Packages.py ServiceManager.py 
Log Message:
Removed dependcies of:

  Zope.ComponentArchitecture
  Zope.Configuration
  Zope.Exceptions
  Zope.Testing

on other packages, especially App, in preparation for making these
packages part of Zope 2 and useful outside of the Zope application.

In particular, all placeful service support was moved to
Zope.App.ComponentArchitecture.  

Placeful service implementors should get the nextService and
nextServiceManager functions from
Zope.App.ComponentArchitecture.NextService. 




=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Packages.py 1.2 => 1.3 ===
 from Zope.ContextWrapper import ContextMethod
 from Zope.Proxy.ContextWrapper import ContextWrapper
 from Zope.App.Traversing import getPhysicalPathString
-from Zope.ComponentArchitecture \
-     import getNextServiceManager
+from Zope.App.ComponentArchitecture.NextService import getNextServiceManager
 from Zope.App.OFS.Services.ServiceManager.IServiceManager \
      import IServiceManager
 


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py 1.6 => 1.7 ===
 
 from Zope.Exceptions import NotFoundError, ZopeError
 
-from Zope.ComponentArchitecture.IServiceManagerContainer \
+from Zope.App.ComponentArchitecture.IServiceManagerContainer \
      import IServiceManagerContainer
-from Zope.ComponentArchitecture \
-     import getService, getNextServiceManager, getNextService, queryAdapter
+from Zope.ComponentArchitecture import getService, queryAdapter
+from Zope.App.ComponentArchitecture.NextService \
+     import getNextServiceManager, getNextService
 from Zope.ComponentArchitecture.GlobalServiceManager import UndefinedService
 from Zope.ComponentArchitecture.GlobalServiceManager import InvalidService
 from Zope.ComponentArchitecture.Exceptions import ComponentLookupError