[CalendarServer-changes] [2040] CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/ directory/principal.py

[source_changes at macosforge.org]

Revision: 2040
          http://trac.macosforge.org/projects/calendarserver/changeset/2040
Author:   wsanchez at apple.com
Date:     2007-12-04 17:11:09 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
Look up GUID records directly

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/principal.py	2007-12-05 01:08:30 UTC (rev 2039)
+++ CalendarServer/branches/users/wsanchez/cache-miss/twistedcaldav/directory/principal.py	2007-12-05 01:11:09 UTC (rev 2040)
@@ -90,7 +90,7 @@
         return self.principalForShortName(DirectoryService.recordType_users, user)
 
     def principalForGUID(self, guid):
-        return self.principalForUID(guid)
+        return self.principalForRecord(self.directory.recordWithGUID(guid))
 
     def principalForUID(self, uid):
         raise NotImplementedError("Subclass must implement principalForUID()")
@@ -98,7 +98,7 @@
     def principalForRecord(self, record):
         if record is None:
             return None
-        return self.principalForGUID(record.guid)
+        return self.principalForUID(record.guid)
 
     def principalForCalendarUserAddress(self, address):
         raise NotImplementedError("Subclass must implement principalForCalendarUserAddress()")

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20071204/635c54b9/attachment-0001.html