[CalendarServer-changes] [4495] CalendarServer/branches/more-deferreds-3/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 13 12:23:00 PDT 2009
Revision: 4495
http://trac.macosforge.org/projects/calendarserver/changeset/4495
Author: william_short at apple.com
Date: 2009-08-13 12:22:58 -0700 (Thu, 13 Aug 2009)
Log Message:
-----------
couple more fixes. 24 failures
Modified Paths:
--------------
CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/calendar.py
CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/principal.py
CalendarServer/branches/more-deferreds-3/twistedcaldav/method/get.py
CalendarServer/branches/more-deferreds-3/twistedcaldav/resource.py
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/calendar.py 2009-08-13 19:22:57 UTC (rev 4494)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/calendar.py 2009-08-13 19:22:58 UTC (rev 4495)
@@ -27,7 +27,7 @@
"DirectoryCalendarHomeResource",
]
-from twisted.internet.defer import succeed, inlineCallbacks, returnValue, gatherResults
+from twisted.internet.defer import succeed, fail, inlineCallbacks, returnValue, gatherResults
from twisted.web2 import responsecode
from twisted.web2.dav import davxml
from twisted.web2.http import HTTPError
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/principal.py 2009-08-13 19:22:57 UTC (rev 4494)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/directory/principal.py 2009-08-13 19:22:58 UTC (rev 4495)
@@ -907,7 +907,7 @@
if config.EnableDropBox:
return self._homeChildURL("dropbox/")
else:
- return None
+ return succeed(None)
def _homeChildURL(self, name):
d = self.calendarHome()
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/method/get.py 2009-08-13 19:22:57 UTC (rev 4494)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/method/get.py 2009-08-13 19:22:58 UTC (rev 4495)
@@ -1,4 +1,4 @@
-\##
+##
# Copyright (c) 2005-2008 Apple Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/resource.py 2009-08-13 19:22:57 UTC (rev 4494)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/resource.py 2009-08-13 19:22:58 UTC (rev 4495)
@@ -887,7 +887,7 @@
elif namespace == calendarserver_namespace:
if name == "dropbox-home-URL" and config.EnableDropBox:
- url = self.dropboxURL()
+ url = yield self.dropboxURL()
if url is None:
returnValue(None)
else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090813/30a5ac41/attachment-0001.html>
More information about the calendarserver-changes
mailing list