<!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>[14713] CalendarServer/trunk/txdav/xml</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/14713">14713</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 11:24:50 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lowercase the encoding name to see if that fixes some cross-pod buildbot failures.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavxmlbasepy">CalendarServer/trunk/txdav/xml/base.py</a></li>
<li><a href="#CalendarServertrunktxdavxmlxmlextpy">CalendarServer/trunk/txdav/xml/xmlext.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavxmlbasepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/xml/base.py (14712 => 14713)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/xml/base.py 2015-04-27 15:11:20 UTC (rev 14712)
+++ CalendarServer/trunk/txdav/xml/base.py 2015-04-27 18:24:50 UTC (rev 14713)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeXML(self, output, pretty=True):
</span><del>- output.write("<?xml version='1.0' encoding='UTF-8'?>" + ("\n" if pretty else ""))
</del><ins>+ output.write("<?xml version='1.0' encoding='utf-8'?>" + ("\n" if pretty else ""))
</ins><span class="cx"> self._writeToStream(output, "", 0, pretty)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavxmlxmlextpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/xml/xmlext.py (14712 => 14713)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/xml/xmlext.py 2015-04-27 15:11:20 UTC (rev 14712)
+++ CalendarServer/trunk/txdav/xml/xmlext.py 2015-04-27 18:24:50 UTC (rev 14713)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml"
</span><span class="cx">
</span><span class="cx">
</span><del>-def Print(root, stream=sys.stdout, encoding='UTF-8'):
</del><ins>+def Print(root, stream=sys.stdout, encoding='utf-8'):
</ins><span class="cx"> if not hasattr(root, "nodeType"):
</span><span class="cx"> return
</span><span class="cx"> nss = SeekNss(root)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def PrettyPrint(root, stream=sys.stdout, encoding='UTF-8', indent=' ',
</del><ins>+def PrettyPrint(root, stream=sys.stdout, encoding='utf-8', indent=' ',
</ins><span class="cx"> preserveElements=None):
</span><span class="cx"> if not hasattr(root, "nodeType"):
</span><span class="cx"> return
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def strobj_to_utf8str(text, encoding):
</span><del>- if string.upper(encoding) not in ["UTF-8", "ISO-8859-1", "LATIN-1"]:
</del><ins>+ if string.upper(encoding) not in ["utf-8", "ISO-8859-1", "LATIN-1"]:
</ins><span class="cx"> raise ValueError("Invalid encoding: %s" % encoding)
</span><span class="cx"> encoder = codecs.lookup(encoding)[0] # encode,decode,reader,writer
</span><span class="cx"> if type(text) is not unicode:
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Note: Unicode object only for now
</span><del>-def TranslateCdata(characters, encoding='UTF-8', prev_chars='', markupSafe=0,
</del><ins>+def TranslateCdata(characters, encoding='utf-8', prev_chars='', markupSafe=0,
</ins><span class="cx"> charsetHandler=utf8_to_code):
</span><span class="cx"> """
</span><span class="cx"> charsetHandler is a function that takes a string or unicode object as the
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def TranslateHtmlCdata(characters, encoding='UTF-8', prev_chars=''):
</del><ins>+def TranslateHtmlCdata(characters, encoding='utf-8', prev_chars=''):
</ins><span class="cx"> # Translate numerical char entity references with HTML entity equivalents
</span><span class="cx"> new_string, _ignore_num_subst = re.subn(
</span><span class="cx"> g_cdataCharPattern,
</span></span></pre>
</div>
</div>
</body>
</html>