[CalendarServer-changes] [4496] CalendarServer/branches/more-deferreds-3/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 13 12:23:01 PDT 2009
Revision: 4496
http://trac.macosforge.org/projects/calendarserver/changeset/4496
Author: william_short at apple.com
Date: 2009-08-13 12:23:00 -0700 (Thu, 13 Aug 2009)
Log Message:
-----------
4 more
Modified Paths:
--------------
CalendarServer/branches/more-deferreds-3/twistedcaldav/index.py
CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py
CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/scheduler.py
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/index.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/index.py 2009-08-13 19:22:58 UTC (rev 4495)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/index.py 2009-08-13 19:23:00 UTC (rev 4496)
@@ -485,7 +485,8 @@
Given a resource name, remove it from the database and re-add it
with a longer expansion.
"""
- d = self.resource.getChild(name).iCalendar()
+ d = self.resource.getChild(name)
+ d.addCallback(lambda r: r.iCalendar())
def _gotCalendar(calendar):
self._add_to_db(name, calendar, expand_until=expand_until, reCreate=True)
self._db_commit()
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py 2009-08-13 19:22:58 UTC (rev 4495)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py 2009-08-13 19:23:00 UTC (rev 4496)
@@ -703,10 +703,9 @@
if old_has_private_comments and not new_has_private_comments:
# Transfer old comments to new calendar
log.debug("Private Comments properties were entirely removed by the client. Restoring existing properties.")
- self.destination.iCalendar().addCallback(
- lambda _: self.calendar.transferProperties(
- "X-CALENDARSERVER-PRIVATE-COMMENT",
- "X-CALENDARSERVER-ATTENDEE-COMMENT"))
+ self.destination.iCalendar().addCallback(self.calendar.transferProperties,
+ ("X-CALENDARSERVER-PRIVATE-COMMENT",
+ "X-CALENDARSERVER-ATTENDEE-COMMENT"))
self.calendardata = None
return new_has_private_comments
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/scheduler.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/scheduler.py 2009-08-13 19:22:58 UTC (rev 4495)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/scheduling/scheduler.py 2009-08-13 19:23:00 UTC (rev 4496)
@@ -564,17 +564,18 @@
# Attendee's Outbox MUST be the request URI
attendeePrincipal = self.resource.principalForCalendarUserAddress(attendee)
- d = attendeePrincipal.scheduleOutboxURL()
- def _gotOutboxURL(outboxURL):
- if attendeePrincipal:
+ if attendeePrincipal:
+ d = attendeePrincipal.scheduleOutboxURL()
+ def _gotOutboxURL(outboxURL):
if self.doingPOST and outboxURL != self.request.uri:
log.err("ATTENDEE in calendar data does not match owner of Outbox: %s" % (self.calendar,))
raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "attendee-allowed")))
- else:
- log.err("Unknown ATTENDEE in calendar data: %s" % (self.calendar,))
- raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "attendee-allowed")))
+
+ return d.addCallback(_gotOutboxURL)
+ else:
+ log.err("Unknown ATTENDEE in calendar data: %s" % (self.calendar,))
+ return fail(HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "attendee-allowed"))))
- return d.addCallback(_gotOutboxURL)
def securityChecks(self):
"""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090813/bfa272a5/attachment.html>
More information about the calendarserver-changes
mailing list