[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.1.2.2 configuration.py:1.1.2.3 event.py:1.1.2.3 hub.py:1.1.2.3 package.py:1.1.2.3 principalannotation.py:1.1.2.2 service.py:1.1.2.2 view.py:1.1.2.2 viewpackage.py:1.1.2.2 zpt.py:1.1.2.3

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	adapter.py configuration.py event.py hub.py package.py 
	principalannotation.py service.py view.py viewpackage.py 
	zpt.py 
Log Message:
refactored context wrappers so we get them just from zope.proxy.context

=== Zope3/src/zope/app/services/adapter.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/adapter.py:1.1.2.1	Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/adapter.py	Mon Dec 23 18:52:35 2002
@@ -27,7 +27,7 @@
 from zope.app.interfaces.services.configuration import IConfigurable
 from zope.app.services.configuration import ConfigurationRegistry
 from zope.app.services.configuration import SimpleConfiguration
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.proxy.context import ContextMethod
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.app.component.nextservice import getNextService


=== Zope3/src/zope/app/services/configuration.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/configuration.py:1.1.2.2	Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/configuration.py	Mon Dec 23 18:52:35 2002
@@ -27,7 +27,7 @@
 from zope.component import getServiceManager
 from zope.component import getAdapter
 from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.proxy.introspection import removeAllProxies
 from zope.security.proxy import Proxy
 from zope.security.checker import InterfaceChecker


=== Zope3/src/zope/app/services/event.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/event.py:1.1.2.2	Mon Dec 23 17:57:44 2002
+++ Zope3/src/zope/app/services/event.py	Mon Dec 23 18:52:35 2002
@@ -32,8 +32,8 @@
 from zope.interfaces.event import IEventChannel
 from zope.interfaces.event import IEventService
 from zope.interfaces.event import ISubscriptionAware
-from zope.proxy.context.context import ContextWrapper
-from zope.proxy.context.context import isWrapper
+from zope.proxy.context import ContextWrapper
+from zope.proxy.context import isWrapper
 from zope.proxy.context import ContextMethod
 from zope.proxy.introspection import removeAllProxies
 


=== Zope3/src/zope/app/services/hub.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/hub.py:1.1.2.2	Mon Dec 23 18:04:43 2002
+++ Zope3/src/zope/app/services/hub.py	Mon Dec 23 18:52:35 2002
@@ -29,8 +29,8 @@
 from zope.app.traversing import locationAsTuple, locationAsUnicode
 from zope.component import getAdapter
 from zope.exceptions import NotFoundError
-from zope.proxy.context.context import ContextWrapper
-from zope.proxy.context.context import isWrapper
+from zope.proxy.context import ContextWrapper
+from zope.proxy.context import isWrapper
 from zope.proxy.context import ContextMethod
 from zope.proxy.introspection import removeAllProxies
 


=== Zope3/src/zope/app/services/package.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/package.py:1.1.2.2	Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/package.py	Mon Dec 23 18:52:35 2002
@@ -22,7 +22,7 @@
 
 from zope.app.container.btree import BTreeContainer
 from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.app.traversing import getPhysicalPathString
 from zope.app.component.nextservice import getNextServiceManager
 from zope.app.interfaces.services.service \


=== Zope3/src/zope/app/services/principalannotation.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.1.2.1	Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/principalannotation.py	Mon Dec 23 18:52:35 2002
@@ -23,7 +23,7 @@
 from zodb.btrees.OOBTree import OOBTree
 from zope.app.component.nextservice import getNextService
 from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.app.interfaces.annotation import IAnnotations
 
 # Sibling imports


=== Zope3/src/zope/app/services/service.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/service.py:1.1.2.1	Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/service.py	Mon Dec 23 18:52:35 2002
@@ -128,7 +128,7 @@
 
 from zope.app.interfaces.container import ISimpleReadContainer
 from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.proxy.introspection import removeAllProxies
 
 from zope.app.services.package import Packages


=== Zope3/src/zope/app/services/view.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/view.py:1.1.2.1	Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/view.py	Mon Dec 23 18:52:35 2002
@@ -26,7 +26,7 @@
 from zope.app.interfaces.services.configuration import IConfigurable
 from zope.app.services.configuration import ConfigurationRegistry
 from zope.app.services.configuration import SimpleConfiguration
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.proxy.context import ContextMethod
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.app.component.nextservice import getNextService


=== Zope3/src/zope/app/services/viewpackage.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/viewpackage.py:1.1.2.1	Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/viewpackage.py	Mon Dec 23 18:52:35 2002
@@ -21,7 +21,7 @@
 from zope.app.interfaces.services.interfaces import IZPTTemplate
 from zope.publisher.interfaces.browser import IBrowserPresentation
 from Zope.App.Traversing import getPhysicalPathString, traverse
-from zope.proxy.context.context import getItem, getAttr
+from zope.proxy.context import getItem, getAttr
 from zope.proxy.context import ContextMethod
 from zope.app.interfaces.services.configuration import Active
 from zope.app.services.configurationmanager \


=== Zope3/src/zope/app/services/zpt.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/zpt.py:1.1.2.2	Mon Dec 23 15:49:39 2002
+++ Zope3/src/zope/app/services/zpt.py	Mon Dec 23 18:52:35 2002
@@ -22,7 +22,7 @@
 from persistence import Persistent
 
 from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import getWrapperContainer
+from zope.proxy.context import getWrapperContainer
 from zope.security.proxy import ProxyFactory
 
 from zope.app.interfaces.content.file import IFileContent