[CalendarServer-changes] [636] CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/ Twisted

[source_changes at macosforge.org]

Revision: 636
          http://trac.macosforge.org/projects/calendarserver/changeset/636
Author:   wsanchez at apple.com
Date:     2006-12-01 10:36:35 -0800 (Fri, 01 Dec 2006)

Log Message:
-----------
Use principalCollection.principalCollectionURL()

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.resource.patch

Added Paths:
-----------
    CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch

Added: CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch	                        (rev 0)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch	2006-12-01 18:36:35 UTC (rev 636)
@@ -0,0 +1,20 @@
+Index: twisted/web2/dav/method/report_principal_property_search.py
+===================================================================
+--- twisted/web2/dav/method/report_principal_property_search.py	(revision 18545)
++++ twisted/web2/dav/method/report_principal_property_search.py	(working copy)
+@@ -127,13 +127,8 @@
+         matchcount = 0
+ 
+         if applyTo:
+-            # Get the principal collection set
+-            pset = waitForDeferred(self.principalCollections(request))
+-            yield pset
+-            pset = pset.getResult()
+-
+-            for phref in pset:
+-                uri = str(phref)
++            for principalCollection in self.principalCollections():
++                uri = principalCollection.principalCollectionURL()
+                 resource = waitForDeferred(request.locateResource(uri))
+                 yield resource
+                 resource = resource.getResult()

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.resource.patch	2006-12-01 18:36:15 UTC (rev 635)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.resource.patch	2006-12-01 18:36:35 UTC (rev 636)
@@ -75,7 +75,7 @@
 -                    d.addCallback(lambda collections: davxml.PrincipalCollectionSet(*collections))
 -                    return d
 +                    return davxml.PrincipalCollectionSet(*[
-+                        davxml.HRef(principalCollection.principalCollectionURI())
++                        davxml.HRef(principalCollection.principalCollectionURL())
 +                        for principalCollection in self.principalCollections()
 +                    ])
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061201/6a7c7460/attachment.html