[CalendarServer-changes] [11362] CalendarServer/trunk/txdav/common/datastore/sql.py

[source_changes at macosforge.org]

Revision: 11362
          http://trac.calendarserver.org//changeset/11362
Author:   glyph at apple.com
Date:     2013-06-13 17:38:43 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
Re-fix bad merge of inlineCallbacks warning fix.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2013-06-14 00:33:45 UTC (rev 11361)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2013-06-14 00:38:43 UTC (rev 11362)
@@ -4899,17 +4899,16 @@
         """
         yield
         if self._txn.isNotifiedAlready(self):
-            return succeed(None)
+            returnValue(None)
         self._txn.notificationAddedForObject(self)
 
         # Send notifications
         if self._notifiers:
             for notifier in self._notifiers.values():
                 self._txn.postCommit(notifier.notify)
+        returnValue(None)
 
-        return succeed(None)
 
-
     @classproperty
     def _completelyNewRevisionQuery(cls): #@NoSelf
         rev = cls._revisionsSchema
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/ef5131d1/attachment-0001.html>