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

[source_changes at macosforge.org]

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

Log Message:
-----------
Better formatting in 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 05:03:54 UTC (rev 424)
+++ CalendarServer/branches/users/wsanchez/provisioning/twistedcaldav/directory/resource.py	2006-11-10 19:14:03 UTC (rev 425)
@@ -154,13 +154,15 @@
 
     def render(self, request):
         def format_list(method, *args):
-            try:
-                for item in method(*args):
-                    yield " -> %s\n" % (item,)
-                else:
-                    yield " '()\n"
-            except Exception, e:
-                yield "  ** %s **: %s\n" % (e.__class__.__name__, e)
+            def genlist():
+                try:
+                    for item in method(*args):
+                        yield " -> %s\n" % (item,)
+                    else:
+                        yield " '()\n"
+                except Exception, e:
+                    yield "  ** %s **: %s\n" % (e.__class__.__name__, e)
+            return "".join(genlist())
 
         output = ("".join((
             "Principal resource\n"
@@ -173,12 +175,12 @@
             "Full name: %(fullName)s\n"
             % self.record.__dict__,
             "Principal UID: %s\n" % self.principalUID(),
-            "\nAlternate URIs:\n"         , "".join(format_list(self.alternateURIs)),
-            "\nGroup members:\n"          , "".join(format_list(self.groupMembers)),
-            "\nGroup memberships:\n"      , "".join(format_list(self.groupMemberships)),
-            "\nPrincipal collections:\n"  , "".join(format_list(self.principalCollections, request)),
-            "\nCalendar homes:\n"         , "".join(format_list(self.calendarHomeURLs)),
-            "\nCalendar user addresses:\n", "".join(format_list(self.calendarUserAddresses)),
+            "\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),
         )))
 
         if type(output) == unicode:

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