[CalendarServer-changes] [2596] CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav /sqlprops.py

[source_changes at macosforge.org]

Revision: 2596
          http://trac.macosforge.org/projects/calendarserver/changeset/2596
Author:   cdaboo at apple.com
Date:     2008-06-18 12:52:23 -0700 (Wed, 18 Jun 2008)

Log Message:
-----------
Only return the list of properties that actually exist.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/sqlprops.py

Modified: CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/sqlprops.py
===================================================================
--- CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/sqlprops.py	2008-06-18 18:51:26 UTC (rev 2595)
+++ CalendarServer/branches/users/cdaboo/sqlpropstore-2563/twistedcaldav/sqlprops.py	2008-06-18 19:52:23 UTC (rev 2596)
@@ -376,7 +376,7 @@
 
         members = set()
         if self.use_cache and self.cache.has_key(rname):
-            members.update(self.cache[rname].iterkeys())
+            members.update([k for k, v in self.cache[rname].iteritems() if v is not None])
         else:
             for row in self._db_execute("select PROPERTYNAME from PROPERTIES where RESOURCENAME = :1", rname):
                 members.add(self._decodePropertyName(row[0]))

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080618/9ded0622/attachment.htm