[CalendarServer-changes] [6011] CalendarServer/branches/users/glyph/sql-store

[source_changes at macosforge.org]

Revision: 6011
          http://trac.macosforge.org/projects/calendarserver/changeset/6011
Author:   glyph at apple.com
Date:     2010-08-09 10:09:49 -0700 (Mon, 09 Aug 2010)
Log Message:
-----------
make 'callback' arg optional so that tests treat the deferred normally

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sql-store/twext/web2/dav/test/util.py
    CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py

Modified: CalendarServer/branches/users/glyph/sql-store/twext/web2/dav/test/util.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twext/web2/dav/test/util.py	2010-08-09 17:08:59 UTC (rev 6010)
+++ CalendarServer/branches/users/glyph/sql-store/twext/web2/dav/test/util.py	2010-08-09 17:09:49 UTC (rev 6011)
@@ -200,7 +200,8 @@
 
         return (os.path.abspath(path), uri)
 
-    def send(self, request, callback):
+
+    def send(self, request, callback=None):
         log.msg("Sending %s request for URI %s" % (request.method, request.uri))
 
         d = request.locateResource(request.uri)

Modified: CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py	2010-08-09 17:08:59 UTC (rev 6010)
+++ CalendarServer/branches/users/glyph/sql-store/twistedcaldav/test/util.py	2010-08-09 17:09:49 UTC (rev 6011)
@@ -382,7 +382,7 @@
 
 
     @inlineCallbacks
-    def send(self, request, callback):
+    def send(self, request, callback=None):
         """
         Override C{send} in order to refresh the 'user' resource each time, to
         get a new transaction to associate with the calendar home.
@@ -452,7 +452,7 @@
 
 
     @inlineCallbacks
-    def send(self, request, callback):
+    def send(self, request, callback=None):
         """
         Override C{send} in order to refresh the 'user' resource each time, to
         get a new transaction to associate with the calendar home.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100809/9a155394/attachment.html>