[CalendarServer-changes] [221] CalendarServer/trunk/twistedcaldav/repository.py

[source_changes at macosforge.org]

Revision: 221
          http://trac.macosforge.org/projects/calendarserver/changeset/221
Author:   wsanchez at apple.com
Date:     2006-09-29 08:52:46 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Don't pass uri argument to constructor that doesn't take one.
Don't call initialize() on a principal collection if we don't have a calendar home.

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

Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py	2006-09-28 22:34:53 UTC (rev 220)
+++ CalendarServer/trunk/twistedcaldav/repository.py	2006-09-29 15:52:46 UTC (rev 221)
@@ -312,11 +312,16 @@
             log.err("Unable to locate Python class %r" % (self.pytype,))
             raise
         kwargs = {}
-        if "url" in resource_class.__init__.func_code.co_varnames:
-            kwargs["url"] = myurl
+        argnames = resource_class.__init__.func_code.co_varnames
+        for name, value in (
+            ("path", mypath),
+            ("url" , myurl ),
+        ):
+            if name in argnames:
+                kwargs[name] = value
         if self.params:
             kwargs["params"] = self.params
-        self.resource = resource_class(mypath, **kwargs)
+        self.resource = resource_class(**kwargs)
 
         self.uri = myurl
         
@@ -510,7 +515,11 @@
         self.principalCollection = principalCollection
         self.calendarHome = calendarHome
 
-        self.principalCollection.resource.initialize(self.calendarHome.uri, self.calendarHome.resource)
+        if self.calendarHome is not None:
+            self.principalCollection.resource.initialize(
+                self.calendarHome.uri,
+                self.calendarHome.resource,
+            )
 
         # Provision each user
         for repeat, principal in self.items:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060929/76a45698/attachment.html