[CalendarServer-changes] [95] CalendarServer/branches/users/cdaboo/acl-merge

[source_changes at macosforge.org]

Revision: 95
Author:   cdaboo at apple.com
Date:     2006-09-01 10:08:11 -0700 (Fri, 01 Sep 2006)

Log Message:
-----------
Fix for ticket #41.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch
    CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/static.py

Modified: CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch	2006-09-01 16:20:52 UTC (rev 94)
+++ CalendarServer/branches/users/cdaboo/acl-merge/patches/Twisted/twisted.web2.server.patch	2006-09-01 17:08:11 UTC (rev 95)
@@ -16,7 +16,7 @@
              # We need to rethink how to do this.
              #if newres is res:
 -                self._rememberURLForResource(path, res)
-+                self.rememberURLForResource(quote(path), res)
++                self._rememberURLForResource(quote(path), res)
                  return res
              #else:
              #    raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
@@ -25,19 +25,10 @@
  
          child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
 -        self._rememberURLForResource(url, child)
-+        self.rememberURLForResource(quote(url), child)
++        self._rememberURLForResource(quote(url), child)
  
          return child
  
-@@ -343,7 +343,7 @@
- 
-     _resourcesByURL = weakref.WeakKeyDictionary()
- 
--    def _rememberURLForResource(self, url, resource):
-+    def rememberURLForResource(self, url, resource):
-         """
-         Remember the URL of visited resources.
-         """
 @@ -404,6 +404,7 @@
          segments = path.split("/")
          assert segments[0] == "", "URL path didn't begin with '/': %s" % (path,)

Modified: CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/static.py	2006-09-01 16:20:52 UTC (rev 94)
+++ CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/static.py	2006-09-01 17:08:11 UTC (rev 95)
@@ -153,8 +153,11 @@
             # Must verify ACLs which means we need a request object at this point
             for name, uid, type in self.index().search(None): #@UnusedVariable
                 try:
-                    child = IDAVResource(self.getChild(name))
-                    request.rememberURLForResource(joinURL(request.uri, str(name)), child)
+                    child_url = joinURL(request.uri, str(name))
+                    child = waitForDeferred(request.locateResource(child_url))
+                    yield child
+                    child = child.getResult()
+                    child = IDAVResource(child)
                 except TypeError:
                     child = None
     

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060901/8371399c/attachment.html