[CalendarServer-changes] [1129] CalendarServer/trunk/twistedcaldav/directory/principal.py

[source_changes at macosforge.org]

Revision: 1129
          http://trac.macosforge.org/projects/calendarserver/changeset/1129
Author:   wsanchez at apple.com
Date:     2007-02-05 16:03:33 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
Handle deferred

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-02-05 23:49:51 UTC (rev 1128)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2007-02-06 00:03:33 UTC (rev 1129)
@@ -340,25 +340,27 @@
             "\nCalendar user addresses:\n" , format_list(link(a) for a in self.calendarUserAddresses()),
         )))
 
-        output.append(
-            """</pre></blockquote></div>"""
-        )
+        output.append("</pre></blockquote></div>")
 
-        output.append(self.getDirectoryTable(request))
+        def gotTable(table, output=output):
+            output.append(table)
+            output.append("</body></html>")
+            output = "".join(output)
 
-        output.append("</body></html>")
+            if type(output) == unicode:
+                output = output.encode("utf-8")
+                mime_params = {"charset": "utf-8"}
+            else:
+                mime_params = {}
 
-        output = "".join(output)
-        if type(output) == unicode:
-            output = output.encode("utf-8")
-            mime_params = {"charset": "utf-8"}
-        else:
-            mime_params = {}
+            response = Response(code=responsecode.OK, stream=output)
+            response.headers.setHeader("content-type", MimeType("text", "html", mime_params))
 
-        response = Response(code=responsecode.OK, stream=output)
-        response.headers.setHeader("content-type", MimeType("text", "html", mime_params))
+            return response
 
-        return response
+        d = self.getDirectoryTable(request)
+        d.addCallback(gotTable)
+        return d
 
     ##
     # DAV

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