*** empty log message ***

lib/python/webdav/NullResource.py

@@ -85,7 +85,7 @@
 
 """WebDAV support - null resource objects."""
 
-__version__='$Revision: 1.7 $'[11:-2]
+__version__='$Revision: 1.8 $'[11:-2]
 
 import sys, os, string, mimetypes
 import Acquisition, OFS.content_types
@@ -105,15 +105,15 @@ class NullResource(Persistent, Acquisition.Implicit, Resource):
         self.__parent__=parent
         self.__roles__=parent.__roles__
 
-
     def __bobo_traverse__(self, REQUEST, name=None):
         # We must handle traversal so that we can recognize situations
         # where a 409 Conflict must be returned instead of the normal
         # 404 Not Found, per [WebDAV 8.3.1].
+        try:    return getattr(self, name)
+        except: pass
         method=REQUEST.get('REQUEST_METHOD', 'GET')
         if method in ('MKCOL',):
-            raise 'Conflict', `name`
-#            raise 'Conflict', 'Collection ancestors must already exist.'
+            raise 'Conflict', 'Collection ancestors must already exist.'
         raise 'Not Found', 'The requested resource was not found.'
 
     def HEAD(self, REQUEST, RESPONSE):

lib/python/webdav/Resource.py

@@ -85,7 +85,7 @@
 
 """WebDAV support - resource objects."""
 
-__version__='$Revision: 1.8 $'[11:-2]
+__version__='$Revision: 1.9 $'[11:-2]
 
 import sys, os, string, mimetypes, xmlcmds
 from common import absattr, aq_base, urlfix, rfc1123_date
@@ -104,12 +104,12 @@ class Resource:
                       'MOVE',
                       )
 
-    def dav__init(self, r):
+    def dav__init(self, request, response):
         # Init expected HTTP 1.1 / WebDAV headers which are not
         # currently set by the response object automagically.
-        r.setHeader('Connection', 'close')
-        r.setHeader('Date', rfc1123_date())
-        r.setHeader('DAV', '1')
+        response.setHeader('Connection', 'close')
+        response.setHeader('Date', rfc1123_date())
+        response.setHeader('DAV', '1')
 
     dav__locks=()