[Zope3-checkins] CVS: Zope3/src/zope/app/traversing - __init__.py:1.1.2.3 acquirenamespace.py:1.1.2.2 getresource.py:1.1.2.2 namespaces.py:1.1.2.2 objectname.py:1.1.2.2 physicallocationadapters.py:1.1.2.2 presentationnamespaces.py:1.1.2.2 traverser.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	__init__.py acquirenamespace.py getresource.py namespaces.py 
	objectname.py physicallocationadapters.py 
	presentationnamespaces.py traverser.py 
Log Message:
refactored context wrappers so we get them just from zope.proxy.context

=== Zope3/src/zope/app/traversing/__init__.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/traversing/__init__.py:1.1.2.2	Mon Dec 23 17:49:34 2002
+++ Zope3/src/zope/app/traversing/__init__.py	Mon Dec 23 18:52:36 2002
@@ -21,8 +21,8 @@
      import IPhysicallyLocatable as _IPhysicallyLocatable
 from traverser import WrapperChain as _WrapperChain
 from traverser import Traverser as _Traverser
-from zope.proxy.context.context import getWrapperContext as _getWrapperContext
-from zope.proxy.context.context import isWrapper as _isWrapper
+from zope.proxy.context import getWrapperContext as _getWrapperContext
+from zope.proxy.context import isWrapper as _isWrapper
 from types import StringTypes
 _marker = object()
 


=== Zope3/src/zope/app/traversing/acquirenamespace.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/acquirenamespace.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/acquirenamespace.py	Mon Dec 23 18:52:36 2002
@@ -20,7 +20,7 @@
 from zope.app.traversing.exceptions import UnexpectedParameters
 from zope.exceptions import NotFoundError
 from zope.component import queryAdapter
-from zope.proxy.context.context import ContextWrapper, getWrapperContext
+from zope.proxy.context import ContextWrapper, getWrapperContext
 from zope.app.interfaces.traversing.traversable import ITraversable
 
 class ExcessiveWrapping(NotFoundError):


=== Zope3/src/zope/app/traversing/getresource.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/getresource.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/getresource.py	Mon Dec 23 18:52:36 2002
@@ -18,7 +18,7 @@
 
 from zope.component import getService
 from zope.exceptions import NotFoundError
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 
 def getResource(ob, name, request):
     resource = queryResource(ob, name, request)


=== Zope3/src/zope/app/traversing/namespaces.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/namespaces.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/namespaces.py	Mon Dec 23 18:52:36 2002
@@ -17,7 +17,7 @@
 """
 
 from zope.exceptions import NotFoundError
-from zope.proxy.context.context import ContextWrapper, getWrapperObject
+from zope.proxy.context import ContextWrapper, getWrapperObject
 from zope.configuration.action import Action
 
 _namespace_handlers = {}


=== Zope3/src/zope/app/traversing/objectname.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/objectname.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/objectname.py	Mon Dec 23 18:52:36 2002
@@ -16,7 +16,7 @@
 Revision information:
 $Id$
 """
-from zope.proxy.context.context import getInnerWrapperData
+from zope.proxy.context import getInnerWrapperData
 
 from zope.interface import Interface
 


=== Zope3/src/zope/app/traversing/physicallocationadapters.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/physicallocationadapters.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/physicallocationadapters.py	Mon Dec 23 18:52:36 2002
@@ -22,7 +22,7 @@
 from zope.app.interfaces.traversing.physicallylocatable import IPhysicallyLocatable
 from zope.app.interfaces.traversing.containmentroot import IContainmentRoot
 from zope.component import getAdapter
-from zope.proxy.context.context import getInnerWrapperData, getWrapperContainer
+from zope.proxy.context import getInnerWrapperData, getWrapperContainer
 
 class WrapperPhysicallyLocatable:
     __doc__ = IPhysicallyLocatable.__doc__


=== Zope3/src/zope/app/traversing/presentationnamespaces.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/presentationnamespaces.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/presentationnamespaces.py	Mon Dec 23 18:52:36 2002
@@ -20,7 +20,7 @@
 from zope.app.traversing.namespaces import provideNamespaceHandler
 from zope.app.traversing.exceptions import UnexpectedParameters
 from zope.exceptions import NotFoundError
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.app.traversing.getresource import queryResource
 
 class NoRequest(NotFoundError):


=== Zope3/src/zope/app/traversing/traverser.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/traverser.py:1.1.2.1	Mon Dec 23 14:32:33 2002
+++ Zope3/src/zope/app/traversing/traverser.py	Mon Dec 23 18:52:36 2002
@@ -17,8 +17,8 @@
 """
 
 from zope.component import getAdapter
-from zope.proxy.context.context import getWrapperContainer
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import getWrapperContainer
+from zope.proxy.context import ContextWrapper
 from zope.component import queryAdapter
 from zope.exceptions import NotFoundError
 from zope.app.traversing.namespaces import namespaceLookup