[CalendarServer-changes] [431] CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/ directory/resource.py

[source_changes at macosforge.org]

Revision: 431
          http://trac.macosforge.org/projects/calendarserver/changeset/431
Author:   wsanchez at apple.com
Date:     2006-11-10 14:41:27 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
More tweaking of render()

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py

Modified: CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py	2006-11-10 22:40:54 UTC (rev 430)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py	2006-11-10 22:41:27 UTC (rev 431)
@@ -27,6 +27,7 @@
 ]
 
 from twisted.python import log
+from twisted.python.failure import Failure
 from twisted.internet.defer import succeed
 from twisted.web2 import responsecode
 from twisted.web2.http import Response, HTTPError
@@ -165,11 +166,14 @@
         def format_list(method, *args):
             def genlist():
                 try:
+                    item = None
                     for item in method(*args):
                         yield " -> %s\n" % (item,)
-                    else:
+                    if item is None:
                         yield " '()\n"
                 except Exception, e:
+                    log.err("Exception while rendering: %s" % (e,))
+                    Failure().printTraceback()
                     yield "  ** %s **: %s\n" % (e.__class__.__name__, e)
             return "".join(genlist())
 
@@ -187,7 +191,6 @@
             "\nAlternate URIs:\n"         , format_list(self.alternateURIs),
             "\nGroup members:\n"          , format_list(self.groupMembers),
             "\nGroup memberships:\n"      , format_list(self.groupMemberships),
-            "\nPrincipal collections:\n"  , format_list(self.principalCollections, request),
             "\nCalendar homes:\n"         , format_list(self.calendarHomeURLs),
             "\nCalendar user addresses:\n", format_list(self.calendarUserAddresses),
         )))
@@ -235,7 +238,7 @@
         # FIXME: self.directory.calendarHomesCollection smells like a hack
         # See CalendarHomeProvisioningFile.__init__()
         return (
-            self.directory.calendarHomesCollection.url(),
+            self.record.service.calendarHomesCollection.url(),
         )
 
     def calendarUserAddresses(self):

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