[CalendarServer-changes] [13598] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon Jun 2 18:12:14 PDT 2014


Revision: 13598
          http://trac.calendarserver.org//changeset/13598
Author:   cdaboo at apple.com
Date:     2014-06-02 18:12:14 -0700 (Mon, 02 Jun 2014)
Log Message:
-----------
Remove unneeded deferreds.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-06-03 01:11:13 UTC (rev 13597)
+++ CalendarServer/trunk/requirements-stable.txt	2014-06-03 01:12:14 UTC (rev 13598)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13580#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13597#egg=twextpy
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13576#egg=pycalendar
 

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py	2014-06-03 01:11:13 UTC (rev 13597)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py	2014-06-03 01:12:14 UTC (rev 13598)
@@ -174,7 +174,6 @@
             smartMerge=smart_merge
         ))
         cls._enqueued()
-        yield proposal.whenProposed()
         log.debug("ScheduleOrganizerWork - enqueued for ID: {id}, UID: {uid}, organizer: {org}", id=proposal.workItem.workID, uid=uid, org=organizer)
 
 
@@ -296,7 +295,6 @@
             changedRids=",".join(map(lambda x: "" if x is None else str(x), changedRids)) if changedRids else None,
         ))
         cls._enqueued()
-        yield proposal.whenProposed()
         log.debug("ScheduleReplyWork - enqueued for ID: {id}, UID: {uid}, attendee: {att}", id=proposal.workItem.workID, uid=resource.uid(), att=attendee)
 
 
@@ -379,7 +377,6 @@
             icalendarText=calendar.getTextWithTimezones(includeTimezones=not config.EnableTimezonesByReference),
         ))
         cls._enqueued()
-        yield proposal.whenProposed()
         log.debug("ScheduleReplyCancelWork - enqueued for ID: {id}, UID: {uid}, attendee: {att}", id=proposal.workItem.workID, uid=calendar.resourceUID(), att=attendee)
 
 
@@ -486,7 +483,6 @@
             notBefore=notBefore,
         ))
         cls._enqueued()
-        yield proposal.whenProposed()
         log.debug("ScheduleRefreshWork - enqueued for ID: {id}, UID: {uid}, attendees: {att}", id=proposal.workItem.workID, uid=organizer_resource.uid(), att=",".join(attendeesToRefresh))
 
 
@@ -626,7 +622,6 @@
             notBefore=notBefore,
         ))
         cls._enqueued()
-        yield proposal.whenProposed()
         log.debug("ScheduleAutoReplyWork - enqueued for ID: {id}, UID: {uid}", id=proposal.workItem.workID, uid=resource.uid())
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2014-06-03 01:11:13 UTC (rev 13597)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2014-06-03 01:12:14 UTC (rev 13598)
@@ -635,8 +635,7 @@
 
         For example::
 
-            yield (txn.enqueue(MyWorkItem, workDescription="some work to do")
-                   .whenProposed())
+            yield (txn.enqueue(MyWorkItem, workDescription="some work to do"))
 
         @return: a work proposal describing various events in the work's
             life-cycle.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140602/1e215f54/attachment-0001.html>


More information about the calendarserver-changes mailing list