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

source_changes at macosforge.org source_changes at macosforge.org
Mon Oct 18 12:08:15 PDT 2010


Revision: 6444
          http://trac.macosforge.org/projects/calendarserver/changeset/6444
Author:   glyph at apple.com
Date:     2010-10-18 12:08:13 -0700 (Mon, 18 Oct 2010)
Log Message:
-----------
sync-report fixes, make sure we wait for revision bumps

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py
    CalendarServer/branches/users/glyph/more-deferreds-7/txdav/carddav/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 19:07:28 UTC (rev 6443)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/twistedcaldav/storebridge.py	2010-10-18 19:08:13 UTC (rev 6444)
@@ -714,15 +714,18 @@
         self._newStoreAttachment.retrieve(StreamProtocol())
         return Response(OK, {"content-type":self.contentType()}, stream)
 
+
     @requiresPermissions(fromParent=[davxml.Unbind()])
+    @inlineCallbacks
     def http_DELETE(self, request):
-        self._newStoreCalendarObject.removeAttachmentWithName(
+        yield self._newStoreCalendarObject.removeAttachmentWithName(
             self._newStoreAttachment.name()
         )
         del self._newStoreCalendarObject
         self.__class__ = ProtoCalendarAttachment
-        return NO_CONTENT
+        returnValue(NO_CONTENT)
 
+
     http_MKCOL = None
     http_MKCALENDAR = None
 
@@ -2224,7 +2227,9 @@
             # Do delete
 
             # FIXME: public attribute please
-            storeNotifications.removeNotificationObjectWithName(self._newStoreObject.name())
+            yield storeNotifications.removeNotificationObjectWithName(
+                self._newStoreObject.name()
+            )
 
             # FIXME: clean this up with a 'transform' method
             self._newStoreParentNotifications = storeNotifications

Modified: CalendarServer/branches/users/glyph/more-deferreds-7/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-7/txdav/carddav/datastore/sql.py	2010-10-18 19:07:28 UTC (rev 6443)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/txdav/carddav/datastore/sql.py	2010-10-18 19:08:13 UTC (rev 6444)
@@ -181,9 +181,9 @@
 
         yield self.updateDatabase(component, inserting=inserting)
         if inserting:
-            self._addressbook._insertRevision(self._name)
+            yield self._addressbook._insertRevision(self._name)
         else:
-            self._addressbook._updateRevision(self._name)
+            yield self._addressbook._updateRevision(self._name)
 
         self._addressbook.notifyChanged()
 

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 19:07:28 UTC (rev 6443)
+++ CalendarServer/branches/users/glyph/more-deferreds-7/txdav/common/datastore/sql.py	2010-10-18 19:08:13 UTC (rev 6444)
@@ -908,7 +908,7 @@
         # update memos
         del self._home._children[oldName]
         self._home._children[name] = self
-        self._renameSyncToken()
+        yield self._renameSyncToken()
 
         self.notifyChanged()
 
@@ -1016,7 +1016,7 @@
         uid = rows[0][0]
         self._objects.pop(name, None)
         self._objects.pop(uid, None)
-        self._deleteRevision(name)
+        yield self._deleteRevision(name)
 
         self.notifyChanged()
 
@@ -1033,7 +1033,7 @@
         name = rows[0][0]
         self._objects.pop(name, None)
         self._objects.pop(uid, None)
-        self._deleteRevision(name)
+        yield self._deleteRevision(name)
 
         self.notifyChanged()
 
@@ -1525,9 +1525,9 @@
             inserting = True
         yield notificationObject.setData(uid, xmltype, xmldata, inserting=inserting)
         if inserting:
-            self._insertRevision("%s.xml" % (uid,))
+            yield self._insertRevision("%s.xml" % (uid,))
         else:
-            self._updateRevision("%s.xml" % (uid,))
+            yield self._updateRevision("%s.xml" % (uid,))
 
 
     def removeNotificationObjectWithName(self, name):
@@ -1580,13 +1580,6 @@
         raise NotImplementedError()
 
 
-    def notificationObjectsSinceToken(self, token):
-        changed = []
-        removed = []
-        token = self.syncToken()
-        return (changed, removed, token)
-
-
     @inlineCallbacks
     def resourceNamesSinceToken(self, token):
         results = [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101018/c5ff5633/attachment.html>


More information about the calendarserver-changes mailing list