[CalendarServer-changes] [1604] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1604
          http://trac.macosforge.org/projects/calendarserver/changeset/1604
Author:   wsanchez at apple.com
Date:     2007-06-18 11:18:40 -0700 (Mon, 18 Jun 2007)

Log Message:
-----------
Don't store None record.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-06-18 17:41:48 UTC (rev 1603)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-06-18 18:18:40 UTC (rev 1604)
@@ -372,7 +372,7 @@
             # Cache miss; try looking the record up, in case it is new
             # FIXME: This is a blocking call (hopefully it's a fast one)
             self.reloadCache(recordType, shortName)
-            return self.recordsForType(recordType)[shortName]
+            return self.recordsForType(recordType).get(shortName, None)
 
     def reloadCache(self, recordType, shortName=None):
         log.msg("Reloading %s record cache" % (recordType,))
@@ -517,15 +517,13 @@
             self._delayedCalls.add(callLater(recordListCacheTimeout, rot))
 
             self._records[recordType] = storage
-        else:
+
+        elif records:
             #
             # Update one record, if found
             #
-            if records:
-                assert len(records) == 1, "shortName = %r, records = %r" % (shortName, len(records))
-                self._records[recordType]["records"][shortName] = records[shortName]
-            else:
-                self._records[recordType]["records"][shortName] = None
+            assert len(records) == 1, "shortName = %r, records = %r" % (shortName, len(records))
+            self._records[recordType]["records"][shortName] = records[shortName]
 
 class OpenDirectoryRecord(DirectoryRecord):
     """

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