[Zope3-checkins] CVS: Zope3/src/zope/app/component - hooks.py:1.7 nextservice.py:1.5

[Jim Fulton]

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

Modified Files:
	hooks.py nextservice.py 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/app/component/hooks.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/component/hooks.py:1.6	Fri May 23 13:52:33 2003
+++ Zope3/src/zope/app/component/hooks.py	Tue May 27 10:18:12 2003
@@ -21,8 +21,8 @@
 from zope.component.exceptions import ComponentLookupError
 from zope.component.servicenames import Adapters
 from zope.app.interfaces.services.service import IServiceManagerContainer
-from zope.proxy.context import getWrapperContainer, ContextWrapper
-from zope.proxy.context import isWrapper, getWrapperData
+from zope.context import getWrapperContainer, ContextWrapper
+from zope.context import isWrapper, getWrapperData
 from zope.component.service import serviceManager
 from zope.proxy.introspection import removeAllProxies
 from zope.security.proxy import trustedRemoveSecurityProxy


=== Zope3/src/zope/app/component/nextservice.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/component/nextservice.py:1.4	Fri May 23 13:43:39 2003
+++ Zope3/src/zope/app/component/nextservice.py	Tue May 27 10:18:12 2003
@@ -18,7 +18,7 @@
 
 from zope.component.exceptions import ComponentLookupError
 from zope.component.service import serviceManager
-from zope.proxy.context import getWrapperContainer
+from zope.context import getWrapperContainer
 from zope.proxy.introspection import removeAllProxies
 from zope.app.interfaces.services.service import IServiceManagerContainer
 from zope.app.component.hooks import getServiceManager_hook