[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser - resource.py:1.1.2.2 resources.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	resource.py resources.py 
Log Message:
refactored context wrappers so we get them just from zope.proxy.context

=== Zope3/src/zope/app/publisher/browser/resource.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/resource.py:1.1.2.1	Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/resource.py	Mon Dec 23 18:52:34 2002
@@ -18,7 +18,7 @@
 __metaclass__ = type # All classes are new style when run with Python 2.2+
 
 from zope.component import queryView
-from zope.proxy.context.context import getWrapperContainer, getInnerWrapperData
+from zope.proxy.context import getWrapperContainer, getInnerWrapperData
 from zope.proxy.context import ContextMethod
 
 class Resource:


=== Zope3/src/zope/app/publisher/browser/resources.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/resources.py:1.1.2.1	Mon Dec 23 14:32:02 2002
+++ Zope3/src/zope/app/publisher/browser/resources.py	Mon Dec 23 18:52:34 2002
@@ -20,7 +20,7 @@
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.component import getService
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.proxy.context import ContextMethod
 from zope.exceptions import NotFoundError