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

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 10 07:44:56 PDT 2015


Revision: 14548
          http://trac.calendarserver.org//changeset/14548
Author:   cdaboo at apple.com
Date:     2015-03-10 07:44:56 -0700 (Tue, 10 Mar 2015)
Log Message:
-----------
Fix issue caused by recent pg8000 changes.

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

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2015-03-10 04:25:03 UTC (rev 14547)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2015-03-10 14:44:56 UTC (rev 14548)
@@ -1043,6 +1043,7 @@
         )
 
 
+    @inlineCallbacks
     def eventsOlderThan(self, cutoff, batchSize=None):
         """
         Return up to the oldest batchSize events which exist completely earlier
@@ -1060,7 +1061,8 @@
                 raise ValueError("Cannot query events older than %s" % (truncateLowerLimit.getText(),))
 
         kwds = {"CutOff": pyCalendarToSQLTimestamp(cutoff)}
-        return self._oldEventsBase(batchSize).on(self, **kwds)
+        rows = yield self._oldEventsBase(batchSize).on(self, **kwds)
+        returnValue([[row[0], row[1], row[2], parseSQLTimestamp(row[3])] for row in rows])
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150310/a82d58aa/attachment.html>


More information about the calendarserver-changes mailing list