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

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	hooks.py nextservice.py 
Log Message:
refactored context wrappers so we get them just from zope.proxy.context

=== Zope3/src/zope/app/component/hooks.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/component/hooks.py:1.1.2.1	Mon Dec 23 14:31:26 2002
+++ Zope3/src/zope/app/component/hooks.py	Mon Dec 23 18:52:31 2002
@@ -19,7 +19,7 @@
 from zope.app.interfaces.services.service \
      import IServiceManagerContainer
 from zope.component.exceptions import ComponentLookupError
-from zope.proxy.context.context import getWrapperContainer, ContextWrapper
+from zope.proxy.context import getWrapperContainer, ContextWrapper
 from zope.component import getServiceManager
 from zope.component.exceptions import ComponentLookupError
 from zope.component.service import serviceManager


=== Zope3/src/zope/app/component/nextservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/component/nextservice.py:1.1.2.1	Mon Dec 23 14:31:26 2002
+++ Zope3/src/zope/app/component/nextservice.py	Mon Dec 23 18:52:31 2002
@@ -18,7 +18,7 @@
 
 from zope.component.exceptions import ComponentLookupError
 from zope.component.service import serviceManager
-from zope.proxy.context.context import getWrapperContainer
+from zope.proxy.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