[CalendarServer-changes] [5921] CalendarServer/trunk/twistedcaldav/storebridge.py

[source_changes at macosforge.org]

Revision: 5921
          http://trac.macosforge.org/projects/calendarserver/changeset/5921
Author:   glyph at apple.com
Date:     2010-07-19 19:31:34 -0700 (Mon, 19 Jul 2010)
Log Message:
-----------
2.5-friendly syntax.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/storebridge.py

Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py	2010-07-20 01:28:10 UTC (rev 5920)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py	2010-07-20 02:31:34 UTC (rev 5921)
@@ -323,8 +323,8 @@
     def __init__(self, path, parent, *a, **kw):
         # FIXME: constructor signature takes a 'path' because CalendarHomeFile
         # requires it, but we don't need it (and shouldn't have it) eventually.
-        super(DropboxCollection, self).__init__(
-            *a, principalCollections=parent.principalCollections(), **kw)
+        kw.update(principalCollections=parent.principalCollections())
+        super(DropboxCollection, self).__init__(*a, **kw)
         self._newStoreCalendarHome = parent._newStoreCalendarHome
         parent.propagateTransaction(self)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100719/197a964f/attachment.html>