[CalendarServer-changes] [1200] CalendarServer/trunk/twistedcaldav/extensions.py

[source_changes at macosforge.org]

Revision: 1200
          http://trac.macosforge.org/projects/calendarserver/changeset/1200
Author:   wsanchez at apple.com
Date:     2007-02-16 15:17:41 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
Handle unicode in dirlist.

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

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2007-02-16 21:54:53 UTC (rev 1199)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2007-02-16 23:17:41 UTC (rev 1200)
@@ -197,16 +197,22 @@
             }
         ]
 
-        def gotTable(table):
-            output.append(table)
+        def gotBody(body, output=output):
+            output.append(body)
             output.append("</body></html>")
 
-            response = Response(200, {}, "".join(output))
+            output = "".join(output)
+
+            if isinstance(output, unicode):
+                output = output.encode("utf-8")
+
+            response = Response(200, {}, output)
             response.headers.setHeader("content-type", MimeType("text", "html"))
+            response.headers.setHeader("content-encoding", "utf-8")
             return response
 
         d = self.renderDirectoryBody(request)
-        d.addCallback(gotTable)
+        d.addCallback(gotBody)
         return d
 
     def renderDirectoryBody(self, request):

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