[Zope3-checkins] CVS: Zope3/src/zope/app/dav - mkcol.py:1.1.22.1 propfind.py:1.11.22.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	mkcol.py propfind.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/dav/mkcol.py 1.1 => 1.1.22.1 ===
--- Zope3/src/zope/app/dav/mkcol.py:1.1	Mon Jun 23 13:21:08 2003
+++ Zope3/src/zope/app/dav/mkcol.py	Mon Sep  8 14:21:36 2003
@@ -17,7 +17,7 @@
 
 from zope.app.interfaces.file import IWriteDirectory
 from zope.app.interfaces.file import IDirectoryFactory
-from zope.app.interfaces.container import IZopeWriteContainer
+from zope.app.interfaces.container import IAddTarget
 from zope.app.event import publish
 from zope.app.event.objectevent import ObjectCreatedEvent
 from zope.component import queryAdapter, getAdapter
@@ -48,12 +48,12 @@
             request.response.setStatus(403)
             return ''
 
-        dir = getAdapter(dir, IZopeWriteContainer)
+        dir = getAdapter(dir, IAddTarget)
 
         factory = getAdapter(container, IDirectoryFactory)
         newdir = factory(name)
         publish(self.context, ObjectCreatedEvent(newdir))
-        dir.setObject(name, newdir)
+        dir.addObject(name, newdir)
 
         request.response.setStatus(201)
         return ''


=== Zope3/src/zope/app/dav/propfind.py 1.11 => 1.11.22.1 ===
--- Zope3/src/zope/app/dav/propfind.py:1.11	Mon Jun 23 13:17:02 2003
+++ Zope3/src/zope/app/dav/propfind.py	Mon Sep  8 14:21:36 2003
@@ -17,7 +17,6 @@
 
 from xml.dom import minidom
 from zope.component import getView, queryView, queryAdapter
-from zope.app.context import ContextWrapper
 from zope.proxy import removeAllProxies
 from zope.schema import getFieldNamesInOrder
 from zope.app.interfaces.container import IReadContainer
@@ -169,8 +168,7 @@
         if depth != '0':
             if IReadContainer.isImplementedBy(self.context):
                 for id, obj in self.context.items():
-                    wrapped = ContextWrapper(obj, self.context, name=id)
-                    pfind = queryView(wrapped, 'PROPFIND', self.request, None)
+                    pfind = queryView(obj, 'PROPFIND', self.request, None)
                     if pfind is not None:
                         pfind.setDepth(subdepth)
                         value = pfind.PROPFIND()