[Zope3-checkins] CVS: Zope3/src/zope/context/tests - test_ContextAware.py:1.3 test_containmentiterator.py:1.4 test_decorator.py:1.11 test_wrapper.py:1.13 test_wrapperinteraction.py:1.5

[Jim Fulton]

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

Modified Files:
	test_ContextAware.py test_containmentiterator.py 
	test_decorator.py test_wrapper.py test_wrapperinteraction.py 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/context/tests/test_ContextAware.py 1.2 => 1.3 ===
--- Zope3/src/zope/context/tests/test_ContextAware.py:1.2	Tue Apr  8 08:21:39 2003
+++ Zope3/src/zope/context/tests/test_ContextAware.py	Tue May 27 10:18:30 2003
@@ -19,8 +19,8 @@
 """
 
 from unittest import TestCase, TestSuite, main, makeSuite
-from zope.proxy.context import ContextAware, ContextWrapper
-from zope.proxy.context import getWrapperContainer
+from zope.context import ContextAware, ContextWrapper
+from zope.context import getWrapperContainer
 
 def setter(self, v):
     self.v = getWrapperContainer(self), v


=== Zope3/src/zope/context/tests/test_containmentiterator.py 1.3 => 1.4 ===
--- Zope3/src/zope/context/tests/test_containmentiterator.py:1.3	Thu May  1 15:35:45 2003
+++ Zope3/src/zope/context/tests/test_containmentiterator.py	Tue May 27 10:18:30 2003
@@ -18,8 +18,8 @@
 
 import unittest
 
-from zope.proxy.context import Wrapper, getbaseobject
-from zope.proxy.context.containmentiterator import ContainmentIterator
+from zope.context import Wrapper, getbaseobject
+from zope.context.containmentiterator import ContainmentIterator
 
 class Test(unittest.TestCase):
 


=== Zope3/src/zope/context/tests/test_decorator.py 1.10 => 1.11 ===
--- Zope3/src/zope/context/tests/test_decorator.py:1.10	Tue May 13 07:33:18 2003
+++ Zope3/src/zope/context/tests/test_decorator.py	Tue May 27 10:18:30 2003
@@ -16,8 +16,8 @@
 """
 import unittest
 
-from zope.proxy.context import wrapper, decorator
-from zope.proxy.context.tests.test_wrapper import WrapperTestCase
+from zope.context import wrapper, decorator
+from zope.context.tests.test_wrapper import WrapperTestCase
 
 class DecoratorTestCase(WrapperTestCase):
 


=== Zope3/src/zope/context/tests/test_wrapper.py 1.12 => 1.13 ===
--- Zope3/src/zope/context/tests/test_wrapper.py:1.12	Mon May 12 11:44:41 2003
+++ Zope3/src/zope/context/tests/test_wrapper.py	Tue May 27 10:18:30 2003
@@ -17,8 +17,8 @@
 import pickle
 import unittest
 
-from zope.proxy.context import wrapper, getcontext, getobject, ContextWrapper
-from zope.proxy.context import ContextMethod, ContextProperty, ContextAware
+from zope.context import wrapper, getcontext, getobject, ContextWrapper
+from zope.context import ContextMethod, ContextProperty, ContextAware
 from zope.proxy.tests.test_proxy import Thing, ProxyTestCase
 
 _marker = object()


=== Zope3/src/zope/context/tests/test_wrapperinteraction.py 1.4 => 1.5 ===
--- Zope3/src/zope/context/tests/test_wrapperinteraction.py:1.4	Thu May  1 15:35:45 2003
+++ Zope3/src/zope/context/tests/test_wrapperinteraction.py	Tue May 27 10:18:30 2003
@@ -24,8 +24,8 @@
 import sys
 import unittest
 
-from zope.proxy.context import Wrapper, ContextMethod, ContextProperty
-from zope.proxy.context import ContextSuper
+from zope.context import Wrapper, ContextMethod, ContextProperty
+from zope.context import ContextSuper
 
 class NewStyleClass(object):
 
@@ -477,7 +477,7 @@
     pass
 
 # XXX commented this test out because of Jim's change in
-# src/zope/proxy/context/__init__.py
+# src/zope/context/__init__.py
 
 ##     def testClassicClassWarning(self):
 ##         from types import ClassType