[CalendarServer-changes] [12673] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 12673
          http://trac.calendarserver.org//changeset/12673
Author:   wsanchez at apple.com
Date:     2014-02-12 00:12:19 -0800 (Wed, 12 Feb 2014)
Log Message:
-----------
Be explicit about string types

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/landing.py
    CalendarServer/trunk/calendarserver/webadmin/logs.py
    CalendarServer/trunk/calendarserver/webadmin/resource.py

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-12 08:12:01 UTC (rev 12672)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-12 08:12:19 UTC (rev 12673)
@@ -38,7 +38,7 @@
     """
 
     def __init__(self):
-        PageElement.__init__(self, "landing")
+        PageElement.__init__(self, u"landing")
 
 
     def pageSlots(self):
@@ -64,11 +64,11 @@
         self.store = store
         self._principalCollections = principalCollections
 
-        self.putChild("logs", LogsResource())
-        self.putChild("principals", PrincipalsResource(directory))
+        self.putChild(u"logs", LogsResource())
+        self.putChild(u"principals", PrincipalsResource(directory))
 
         self.putChild(
-            "old",
+            u"old",
             WebAdminResource(
                 path, root, directory, store, principalCollections
             )

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 08:12:01 UTC (rev 12672)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 08:12:19 UTC (rev 12673)
@@ -50,7 +50,7 @@
     """
 
     def __init__(self):
-        PageElement.__init__(self, "logs")
+        PageElement.__init__(self, u"logs")
 
 
     def pageSlots(self):
@@ -71,7 +71,7 @@
     def __init__(self):
         TemplateResource.__init__(self, LogsPageElement)
 
-        self.putChild("events", LogEventsResource())
+        self.putChild(u"events", LogEventsResource())
 
 
 
@@ -101,7 +101,7 @@
 
 
     def render(self, request):
-        start = request.headers.getRawHeaders("last-event-id")
+        start = request.headers.getRawHeaders(u"last-event-id")
 
         if start is not None:
             try:
@@ -112,7 +112,7 @@
         response = Response()
         response.stream = LogEventStream(self, start=start)
         response.headers.setHeader(
-            "content-type", MimeType.fromString("text/event-stream")
+            b"content-type", MimeType.fromString(b"text/event-stream")
         )
         return response
 
@@ -157,7 +157,7 @@
             self._start = messageID
 
             if eventClass == u"access":
-                message = event["log-format"] % event
+                message = event[u"log-format"] % event
             else:
                 message = observer.formatEvent(event)
                 if message is None:
@@ -256,7 +256,7 @@
 
     def logStats(self, event):
         # Only look at access log events
-        if event["type"] != "access-log":
+        if event[u"type"] != u"access-log":
             return
 
         self._buffer.append((self, u"access", event))
@@ -276,4 +276,4 @@
         u"data: {0}".format(l) for l in text.split("\n")
     )
 
-    return u"\n".join(event).encode("utf-8") + "\n\n"
+    return u"\n".join(event).encode(u"utf-8") + "\n\n"

Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-12 08:12:01 UTC (rev 12672)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-12 08:12:19 UTC (rev 12673)
@@ -736,7 +736,7 @@
 
         self.loader = XMLFile(
             getModule(__name__).filePath.sibling(
-                "{name}.xhtml".format(name=templateName)
+                u"{name}.xhtml".format(name=templateName)
             )
         )
 
@@ -757,10 +757,10 @@
     @renderer
     def stylesheet(self, request, tag):
         return tags.link(
-            rel="stylesheet",
-            media="screen",
-            href="/style.css",
-            type="text/css",
+            rel=u"stylesheet",
+            media=u"screen",
+            href=u"/style.css",
+            type=u"text/css",
         )
 
 
@@ -802,7 +802,7 @@
         response = Response()
         response.stream = MemoryStream(htmlContent)
         response.headers.setHeader(
-            "content-type", MimeType.fromString("text/html; charset=utf-8")
+            b"content-type", MimeType.fromString(b"text/html; charset=utf-8")
         )
 
         returnValue(response)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/37952767/attachment.html>