[CalendarServer-changes] [7291] CalendarServer/trunk/twistedcaldav/directory

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 5 19:34:54 PDT 2011


Revision: 7291
          http://trac.macosforge.org/projects/calendarserver/changeset/7291
Author:   cdaboo at apple.com
Date:     2011-04-05 19:34:53 -0700 (Tue, 05 Apr 2011)
Log Message:
-----------
Need propfind cache key to work across server processes.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2011-04-04 23:21:38 UTC (rev 7290)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2011-04-06 02:34:53 UTC (rev 7291)
@@ -163,8 +163,8 @@
         return 0
 
     def __hash__(self):
-        h = hash(self.__class__)
-        for attr in ("directory", "node"):
+        h = hash(self.__class__.__name__)
+        for attr in ("node",):
             h = (h + hash(getattr(self, attr))) & sys.maxint
         return h
 

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2011-04-04 23:21:38 UTC (rev 7290)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2011-04-06 02:34:53 UTC (rev 7291)
@@ -419,7 +419,7 @@
         return 0
 
     def __hash__(self):
-        h = hash(self.__class__)
+        h = hash(self.__class__.__name__)
         for attr in ("service", "recordType", "shortNames", "guid",
                      "enabled", "enabledForCalendaring"):
             h = (h + hash(getattr(self, attr))) & sys.maxint

Modified: CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py	2011-04-04 23:21:38 UTC (rev 7290)
+++ CalendarServer/trunk/twistedcaldav/directory/opendirectorybacker.py	2011-04-06 02:34:53 UTC (rev 7291)
@@ -230,8 +230,8 @@
         return 0
 
     def __hash__(self):
-        h = hash(self.__class__)
-        for attr in ("directory", "node"):
+        h = hash(self.__class__.__name__)
+        for attr in ("node",):
             h = (h + hash(getattr(self, attr))) & sys.maxint
         return h
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110405/5fa1227d/attachment.html>


More information about the calendarserver-changes mailing list