<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12673] CalendarServer/trunk/calendarserver/webadmin</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12673">12673</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 00:12:19 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Be explicit about string types</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingpy">CalendarServer/trunk/calendarserver/webadmin/landing.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlogspy">CalendarServer/trunk/calendarserver/webadmin/logs.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminresourcepy">CalendarServer/trunk/calendarserver/webadmin/resource.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminlandingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py (12672 => 12673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self):
</span><del>- PageElement.__init__(self, "landing")
</del><ins>+ PageElement.__init__(self, u"landing")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def pageSlots(self):
</span><span class="lines">@@ -64,11 +64,11 @@
</span><span class="cx"> self.store = store
</span><span class="cx"> self._principalCollections = principalCollections
</span><span class="cx">
</span><del>- self.putChild("logs", LogsResource())
- self.putChild("principals", PrincipalsResource(directory))
</del><ins>+ self.putChild(u"logs", LogsResource())
+ self.putChild(u"principals", PrincipalsResource(directory))
</ins><span class="cx">
</span><span class="cx"> self.putChild(
</span><del>- "old",
</del><ins>+ u"old",
</ins><span class="cx"> WebAdminResource(
</span><span class="cx"> path, root, directory, store, principalCollections
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlogspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py (12672 => 12673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self):
</span><del>- PageElement.__init__(self, "logs")
</del><ins>+ PageElement.__init__(self, u"logs")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def pageSlots(self):
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> def __init__(self):
</span><span class="cx"> TemplateResource.__init__(self, LogsPageElement)
</span><span class="cx">
</span><del>- self.putChild("events", LogEventsResource())
</del><ins>+ self.putChild(u"events", LogEventsResource())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def render(self, request):
</span><del>- start = request.headers.getRawHeaders("last-event-id")
</del><ins>+ start = request.headers.getRawHeaders(u"last-event-id")
</ins><span class="cx">
</span><span class="cx"> if start is not None:
</span><span class="cx"> try:
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> response = Response()
</span><span class="cx"> response.stream = LogEventStream(self, start=start)
</span><span class="cx"> response.headers.setHeader(
</span><del>- "content-type", MimeType.fromString("text/event-stream")
</del><ins>+ b"content-type", MimeType.fromString(b"text/event-stream")
</ins><span class="cx"> )
</span><span class="cx"> return response
</span><span class="cx">
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> self._start = messageID
</span><span class="cx">
</span><span class="cx"> if eventClass == u"access":
</span><del>- message = event["log-format"] % event
</del><ins>+ message = event[u"log-format"] % event
</ins><span class="cx"> else:
</span><span class="cx"> message = observer.formatEvent(event)
</span><span class="cx"> if message is None:
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> def logStats(self, event):
</span><span class="cx"> # Only look at access log events
</span><del>- if event["type"] != "access-log":
</del><ins>+ if event[u"type"] != u"access-log":
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> self._buffer.append((self, u"access", event))
</span><span class="lines">@@ -276,4 +276,4 @@
</span><span class="cx"> u"data: {0}".format(l) for l in text.split("\n")
</span><span class="cx"> )
</span><span class="cx">
</span><del>- return u"\n".join(event).encode("utf-8") + "\n\n"
</del><ins>+ return u"\n".join(event).encode(u"utf-8") + "\n\n"
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py (12672 => 12673)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> self.loader = XMLFile(
</span><span class="cx"> getModule(__name__).filePath.sibling(
</span><del>- "{name}.xhtml".format(name=templateName)
</del><ins>+ u"{name}.xhtml".format(name=templateName)
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -757,10 +757,10 @@
</span><span class="cx"> @renderer
</span><span class="cx"> def stylesheet(self, request, tag):
</span><span class="cx"> return tags.link(
</span><del>- rel="stylesheet",
- media="screen",
- href="/style.css",
- type="text/css",
</del><ins>+ rel=u"stylesheet",
+ media=u"screen",
+ href=u"/style.css",
+ type=u"text/css",
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> response = Response()
</span><span class="cx"> response.stream = MemoryStream(htmlContent)
</span><span class="cx"> response.headers.setHeader(
</span><del>- "content-type", MimeType.fromString("text/html; charset=utf-8")
</del><ins>+ b"content-type", MimeType.fromString(b"text/html; charset=utf-8")
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> returnValue(response)
</span></span></pre>
</div>
</div>
</body>
</html>