[CalendarServer-changes] [1730] CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/ directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 1730
          http://trac.macosforge.org/projects/calendarserver/changeset/1730
Author:   wsanchez at apple.com
Date:     2007-07-30 11:04:32 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
Merge up principalForUID -> principalForGUID fix from guid-cleanup branch.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/calendaruserproxy.py

Modified: CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/calendaruserproxy.py	2007-07-30 18:03:57 UTC (rev 1729)
+++ CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/calendaruserproxy.py	2007-07-30 18:04:32 UTC (rev 1730)
@@ -292,7 +292,7 @@
         if self.hasEditableMembership():
             # Get member UIDs from database and map to principal resources
             members = self._index().getMembers(self.uid)
-            return [self.pcollection.principalForGUID(uid) for uid in members]
+            return [self.pcollection.principalForUID(uid) for uid in members]
         else:
             # Fixed proxies are only for read-write - the read-only list is empty
             if self.proxyType == "calendar-proxy-write":
@@ -303,7 +303,7 @@
     def groupMemberships(self):
         # Get membership UIDs and map to principal resources
         memberships = self._index().getMemberships(self.uid)
-        return [self.pcollection.principalForGUID(uid) for uid in memberships]
+        return [self.pcollection.principalForUID(uid) for uid in memberships]
 
     def hasEditableMembership(self):
         return self.parent.hasEditableProxyMembership()

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