[Zope3-checkins] CVS: Zope3/src/zope/app - attributeannotations.py:1.3 zapi.py:1.2

[Jim Fulton]

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

Modified Files:
	attributeannotations.py zapi.py 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/app/attributeannotations.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/attributeannotations.py:1.2	Wed Dec 25 09:12:24 2002
+++ Zope3/src/zope/app/attributeannotations.py	Tue May 27 10:18:05 2003
@@ -19,7 +19,7 @@
 from zodb.btrees.OOBTree import OOBTree
 from zope.app.interfaces.annotation import IAnnotations
 from zope.proxy.introspection import removeAllProxies
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
 
 class AttributeAnnotations:
     """


=== Zope3/src/zope/app/zapi.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/zapi.py:1.1	Fri May 23 18:18:13 2003
+++ Zope3/src/zope/app/zapi.py	Tue May 27 10:18:05 2003
@@ -20,13 +20,13 @@
 
 from zope.app.interfaces.zapi import IZAPI
 from zope.interface import moduleProvides
-from zope.proxy.context import getWrapperData
+from zope.context import getWrapperData
 
 moduleProvides(IZAPI)
 __all__ = tuple(IZAPI)
 
 from zope.component import *
-from zope.proxy.context import *
+from zope.context import *
 
 def name(object):
     data = getWrapperData(object)