[Zope3-checkins] CVS: Zope3/src/zope/app/browser/container - contents.py:1.1.2.2 find.py:1.1.2.2

[Jim Fulton]

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

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

=== Zope3/src/zope/app/browser/container/contents.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/container/contents.py:1.1.2.1	Mon Dec 23 14:31:02 2002
+++ Zope3/src/zope/app/browser/container/contents.py	Mon Dec 23 18:52:28 2002
@@ -21,7 +21,7 @@
 from zope.component \
      import queryView, getView, queryAdapter,  getAdapter
 from zope.app.interfaces.dublincore import IZopeDublinCore
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
 from zope.app.interfaces.container import IZopeContainer
 
 class Contents(BrowserView):


=== Zope3/src/zope/app/browser/container/find.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/container/find.py:1.1.2.1	Mon Dec 23 14:31:02 2002
+++ Zope3/src/zope/app/browser/container/find.py	Mon Dec 23 18:52:28 2002
@@ -46,7 +46,7 @@
             result.append({ 'id': id, 'url': url})
         return result
     
-from zope.proxy.context.context import getInnerWrapperData
+from zope.proxy.context import getInnerWrapperData
 
 # XXX get the id of an object (should be imported from somewhere)
 def getId(object):