[Zope3-checkins] CVS: Zope3/src/zope/app/content - dtmlpage.py:1.4 fssync.py:1.7 sql.py:1.5 zpt.py:1.11

[Jim Fulton]

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

Modified Files:
	dtmlpage.py fssync.py sql.py zpt.py 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/app/content/dtmlpage.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.3	Mon Jan  6 10:46:26 2003
+++ Zope3/src/zope/app/content/dtmlpage.py	Tue May 27 10:18:14 2003
@@ -20,8 +20,8 @@
 from zope.app.interfaces.content.file import IFileContent
 from zope.app.interfaces.content.dtmlpage import IDTMLPage, IRenderDTMLPage
 
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import getWrapperContainer
+from zope.context import ContextMethod
+from zope.context import getWrapperContainer
 from zope.security.proxy import ProxyFactory
 
 from zope.documenttemplate.dt_html import HTML


=== Zope3/src/zope/app/content/fssync.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/content/fssync.py:1.6	Thu May 15 17:28:25 2003
+++ Zope3/src/zope/app/content/fssync.py	Tue May 27 10:18:14 2003
@@ -21,7 +21,7 @@
 from zope.app.content.zpt import ZPTPage
 from zope.app.fssync.classes import ObjectEntryAdapter, AttrMapping
 from zope.app.interfaces.fssync import IObjectFile, IContentDirectory
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
 
 class FileAdapter(ObjectEntryAdapter):
     """ObjectFile adapter for file objects."""


=== Zope3/src/zope/app/content/sql.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/content/sql.py:1.4	Thu May  1 15:35:10 2003
+++ Zope3/src/zope/app/content/sql.py	Tue May 27 10:18:14 2003
@@ -158,7 +158,7 @@
 from zope.interface.common.mapping import IEnumerableMapping
 
 from zope.component import getService
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
 
 from zope.app.cache.caching import getCacheForObj, getLocationForCache
 from zope.app.interfaces.content.file import IFileContent


=== Zope3/src/zope/app/content/zpt.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/content/zpt.py:1.10	Fri Apr 18 14:45:01 2003
+++ Zope3/src/zope/app/content/zpt.py	Tue May 27 10:18:14 2003
@@ -19,8 +19,8 @@
 
 from persistence import Persistent
 
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import getWrapperContainer
+from zope.context import ContextMethod
+from zope.context import getWrapperContainer
 from zope.proxy.introspection import removeAllProxies
 from zope.security.proxy import ProxyFactory