[CalendarServer-changes] [6440] CalendarServer/branches/users/glyph/more-deferreds-7

[source_changes at macosforge.org]

Revision: 6440
          http://trac.macosforge.org/projects/calendarserver/changeset/6440
Author:   glyph at apple.com
Date:     2010-10-18 10:21:24 -0700 (Mon, 18 Oct 2010)
Log Message:
-----------
dropboxID is async, take that into account

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py
    CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/sql.py
    CalendarServer/branches/users/glyph/more-deferreds-7/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py	2010-10-18 17:20:41 UTC (rev 6439)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py	2010-10-18 17:21:24 UTC (rev 6440)
@@ -454,9 +454,11 @@
     def isCollection(self):
         return False
 
+
     def exists(self):
         return False
 
+
     def http_GET(self, request):
         return NOT_FOUND
 

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/sql.py	2010-10-18 17:20:41 UTC (rev 6439)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/txdav/caldav/datastore/sql.py	2010-10-18 17:21:24 UTC (rev 6440)
@@ -82,6 +82,7 @@
     calendars = CommonHome.children
     listCalendars = CommonHome.listChildren
 
+
     @inlineCallbacks
     def calendarObjectWithDropboxID(self, dropboxID):
         """
@@ -89,7 +90,8 @@
         """
         for calendar in (yield self.calendars()):
             for calendarObject in (yield calendar.calendarObjects()):
-                if dropboxID == calendarObject.dropboxID():
+                dbid = yield calendarObject.dropboxID()
+                if dropboxID == dbid:
                     returnValue(calendarObject)
 
 

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/txdav/common/datastore/sql.py	2010-10-18 17:20:41 UTC (rev 6439)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/txdav/common/datastore/sql.py	2010-10-18 17:21:24 UTC (rev 6440)
@@ -550,6 +550,7 @@
         """
         return self._childWithName(name, owned=True)
 
+
     @memoized('name', '_sharedChildren')
     def sharedChildWithName(self, name):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101018/42ba7264/attachment.html>