[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - resource.py:1.4 resources.py:1.7 viewmeta.py:1.25

[Jim Fulton]

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

Modified Files:
	resource.py resources.py viewmeta.py 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/app/publisher/browser/resource.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/publisher/browser/resource.py:1.3	Tue Apr 15 08:24:33 2003
+++ Zope3/src/zope/app/publisher/browser/resource.py	Tue May 27 10:18:22 2003
@@ -18,8 +18,8 @@
 __metaclass__ = type # All classes are new style when run with Python 2.2+
 
 from zope.component import queryView
-from zope.proxy.context import getWrapperContainer, getInnerWrapperData
-from zope.proxy.context import ContextMethod
+from zope.context import getWrapperContainer, getInnerWrapperData
+from zope.context import ContextMethod
 from zope.app.traversing import joinPath
 
 class Resource:


=== Zope3/src/zope/app/publisher/browser/resources.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.6	Tue Feb 11 21:17:27 2003
+++ Zope3/src/zope/app/publisher/browser/resources.py	Tue May 27 10:18:22 2003
@@ -21,8 +21,8 @@
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.component import getService
 from zope.app.services.servicenames import Resources as ResourceService
-from zope.proxy.context import ContextWrapper
-from zope.proxy.context import ContextMethod
+from zope.context import ContextWrapper
+from zope.context import ContextMethod
 from zope.exceptions import NotFoundError
 
 class Resources(BrowserView):


=== Zope3/src/zope/app/publisher/browser/viewmeta.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/publisher/browser/viewmeta.py:1.24	Wed May 14 09:33:02 2003
+++ Zope3/src/zope/app/publisher/browser/viewmeta.py	Tue May 27 10:18:22 2003
@@ -46,7 +46,7 @@
 
 from zope.app.security.permission import checkPermission
 
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
 
 from zope.app.publisher.browser.globalbrowsermenuservice \
      import menuItemDirective, globalBrowserMenuService