[CalendarServer-changes] [534] CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/ Twisted/twisted.web2.dav.resource.patch

[source_changes at macosforge.org]

Revision: 534
          http://trac.macosforge.org/projects/calendarserver/changeset/534
Author:   cdaboo at apple.com
Date:     2006-11-21 07:53:38 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
Exit principal find loop as soon as we have one.

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

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-11-21 05:03:38 UTC (rev 533)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/lib-patches/Twisted/twisted.web2.dav.resource.patch	2006-11-21 15:53:38 UTC (rev 534)
@@ -423,19 +423,18 @@
 +            collection = collection.getResult()
  
 -            principal = waitForDeferred(request.locateResource(principalURI))
+-            yield principal
+-            principal = principal.getResult()
 +            assert collection is not None, "Unable to locate principal collection %s" % (collectionURI,)
-+
+ 
+-            if isPrincipalResource(principal):
+-                yield (principal, principalURI)
 +            # FIXME: collection = IPrincipalCollectionResource(collection)
 +            principal = collection.principalForUser(authid)
 +
-+            # FIXME: Why return a tuple?
-+
-             yield principal
--            principal = principal.getResult()
--
--            if isPrincipalResource(principal):
--                yield (principal, principalURI)
--                return
++            if principal:
++                yield principal
+                 return
          else:
 -            principalCollections = waitForDeferred(self.principalCollections(request))
 -            yield principalCollections

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061121/7787cbb3/attachment.html