[Zope3-checkins] CVS: Zope3/src/zope/app/traversing/tests - test_acquire.py:1.1.2.2 test_conveniencefunctions.py:1.1.2.3 test_namespacetrversal.py:1.1.2.2 test_objectname.py:1.1.2.2 test_physicallocationadapters.py:1.1.2.2 test_traverser.py:1.1.2.2
Jim Fulton
jim@zope.com
Mon, 23 Dec 2002 18:53:08 -0500
Update of /cvs-repository/Zope3/src/zope/app/traversing/tests
In directory cvs.zope.org:/tmp/cvs-serv2518/zope/app/traversing/tests
Modified Files:
Tag: NameGeddon-branch
test_acquire.py test_conveniencefunctions.py
test_namespacetrversal.py test_objectname.py
test_physicallocationadapters.py test_traverser.py
Log Message:
refactored context wrappers so we get them just from zope.proxy.context
=== Zope3/src/zope/app/traversing/tests/test_acquire.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/tests/test_acquire.py:1.1.2.1 Mon Dec 23 14:32:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_acquire.py Mon Dec 23 18:52:37 2002
@@ -22,7 +22,7 @@
from zope.app.interfaces.traversing.traversable import ITraversable
from zope.app.traversing.defaulttraversable import DefaultTraversable
from zope.component.adapter import provideAdapter
-from zope.proxy.context.context import ContextWrapper, getWrapperContext
+from zope.proxy.context import ContextWrapper, getWrapperContext
from zope.app.traversing.acquirenamespace import acquire
from zope.exceptions import NotFoundError
=== Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py:1.1.2.2 Mon Dec 23 18:22:21 2002
+++ Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py Mon Dec 23 18:52:37 2002
@@ -18,7 +18,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.traversing.traverser import Traverser
from zope.component import getService
=== Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py:1.1.2.1 Mon Dec 23 14:32:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py Mon Dec 23 18:52:37 2002
@@ -52,7 +52,7 @@
def testSideEffectsContextDetail(self):
# Check to make sure that when we traverse something in context,
# that we get the right context for the result.
- from zope.proxy.context.context \
+ from zope.proxy.context \
import ContextWrapper, getWrapperContainer
from zope.app.traversing.traverser import Traverser
from zope.publisher.browser import TestRequest
=== Zope3/src/zope/app/traversing/tests/test_objectname.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/tests/test_objectname.py:1.1.2.1 Mon Dec 23 14:32:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_objectname.py Mon Dec 23 18:52:37 2002
@@ -22,7 +22,7 @@
from zope.app.tests.placelesssetup import PlacelessSetup
from zope.component import getService, getAdapter
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.traversing.objectname \
import IObjectName, ObjectName, SiteObjectName
=== Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py:1.1.2.1 Mon Dec 23 14:32:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py Mon Dec 23 18:52:37 2002
@@ -24,7 +24,7 @@
from zope.app.interfaces.traversing.physicallylocatable import IPhysicallyLocatable
from zope.app.traversing.physicallocationadapters \
import WrapperPhysicallyLocatable, RootPhysicallyLocatable
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
class Root: __implements__ = IContainmentRoot
class C: pass
=== Zope3/src/zope/app/traversing/tests/test_traverser.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/traversing/tests/test_traverser.py:1.1.2.1 Mon Dec 23 14:32:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_traverser.py Mon Dec 23 18:52:37 2002
@@ -27,7 +27,7 @@
from zope.app.traversing.physicallocationadapters \
import WrapperPhysicallyLocatable, RootPhysicallyLocatable
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.exceptions import NotFoundError, Unauthorized
from zope.component import getService
from zope.security.securitymanagement \