[CalendarServer-changes] [196] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static. patch

[source_changes at macosforge.org]

Revision: 196
          http://trac.macosforge.org/projects/calendarserver/changeset/196
Author:   cdaboo at apple.com
Date:     2006-09-25 19:23:29 -0700 (Mon, 25 Sep 2006)

Log Message:
-----------
Fix for directory listing problem ticket #53.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch	2006-09-26 00:11:34 UTC (rev 195)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch	2006-09-26 02:23:29 UTC (rev 196)
@@ -2,7 +2,15 @@
 ===================================================================
 --- twisted/web2/dav/static.py	(revision 18219)
 +++ twisted/web2/dav/static.py	(working copy)
-@@ -98,6 +98,50 @@
+@@ -21,6 +21,7 @@
+ #
+ # DRI: Wilfredo Sanchez, wsanchez at apple.com
+ ##
++from os import path
+ 
+ """
+ WebDAV-aware static resources.
+@@ -98,6 +99,50 @@
          return succeed(davPrivilegeSet)
  
      ##
@@ -53,3 +61,17 @@
      # Workarounds for issues with File
      ##
  
+@@ -135,8 +180,12 @@
+                 else:
+                     children = []
+ 
++                    def _childname(r, u):
++                        u = u.rstrip("/")
++                        children.append(u.split("/")[-1])
++
+                     d = self.findChildren('1', request,
+-                                          lambda r,u: children.append(os.path.basename(u)),
++                                          _childname,
+                                           (davxml.Read(),))
+                     d = waitForDeferred(d)
+                     yield d

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060925/4a649af2/attachment.html