<!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>[12714] CalendarServer/trunk</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/12714">12714</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 10:15:54 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix format string spec - need" :d" not "!d".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryldapdirectorypy">CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectoryldapdirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py (12713 => 12714)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2014-02-15 01:11:35 UTC (rev 12713)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2014-02-17 18:15:54 UTC (rev 12714)
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> self.log.error(
</span><del>- "Giving up on LDAP authentication after {count!d} tries. "
</del><ins>+ "Giving up on LDAP authentication after {count:d} tries. "
</ins><span class="cx"> "Responding with 503.", count=TRIES
</span><span class="cx"> )
</span><span class="cx"> raise HTTPError(StatusResponse(
</span><span class="lines">@@ -609,16 +609,16 @@
</span><span class="cx"> return []
</span><span class="cx"> except ldap.SIZELIMIT_EXCEEDED, e:
</span><span class="cx"> self.log.debug(
</span><del>- "LDAP result limit exceeded: {limit!d}", limit=resultLimit
</del><ins>+ "LDAP result limit exceeded: {limit:d}", limit=resultLimit
</ins><span class="cx"> )
</span><span class="cx"> except ldap.TIMELIMIT_EXCEEDED, e:
</span><span class="cx"> self.log.warn(
</span><del>- "LDAP timeout exceeded: {t!d} seconds", t=timeoutSeconds
</del><ins>+ "LDAP timeout exceeded: {t:d} seconds", t=timeoutSeconds
</ins><span class="cx"> )
</span><span class="cx"> except ldap.SERVER_DOWN:
</span><span class="cx"> self.ldap = None
</span><span class="cx"> self.log.error(
</span><del>- "LDAP server unavailable (tried {count!d} times)",
</del><ins>+ "LDAP server unavailable (tried {count:d} times)",
</ins><span class="cx"> count=(i + 1)
</span><span class="cx"> )
</span><span class="cx"> continue
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> filterstr = "%s..." % (filterstr[:100],)
</span><span class="cx"> self.log.error(
</span><span class="cx"> "LDAP query exceeded threshold: {time!.2f} seconds for "
</span><del>- "{base} {filter} {attrs} (#results={count!d})",
</del><ins>+ "{base} {filter} {attrs} (#results={count:d})",
</ins><span class="cx"> time=totalTime, base=base, filter=filterstr,
</span><span class="cx"> attrs=attrlist, count=len(result),
</span><span class="cx"> )
</span><span class="lines">@@ -1314,7 +1314,7 @@
</span><span class="cx"> if filterstr is not None:
</span><span class="cx"> # Query the LDAP server
</span><span class="cx"> self.log.debug(
</span><del>- "LDAP search {base} {filter} (limit={limit!d})",
</del><ins>+ "LDAP search {base} {filter} (limit={limit:d})",
</ins><span class="cx"> base=ldap.dn.dn2str(base), filter=filterstr,
</span><span class="cx"> limit=limitResults,
</span><span class="cx"> )
</span><span class="lines">@@ -1360,8 +1360,8 @@
</span><span class="cx"> numMissingRecordNames += 1
</span><span class="cx">
</span><span class="cx"> self.log.debug(
</span><del>- "LDAP search returned {resultCount!d} results, "
- "{typeCount!d} usable",
</del><ins>+ "LDAP search returned {resultCount:d} results, "
+ "{typeCount:d} usable",
</ins><span class="cx"> resultCount=len(results), typeCount=typeCounts[recordType]
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> )
</span><span class="cx"> totalTime = time.time() - startTime
</span><span class="cx"> self.log.info(
</span><del>- "Calendar user search for {tokens} matched {recordCount!d} "
</del><ins>+ "Calendar user search for {tokens} matched {recordCount:d} "
</ins><span class="cx"> "records ({typeCount}) in {time!.2f} seconds",
</span><span class="cx"> tokens=tokens, recordCount=len(records),
</span><span class="cx"> typeCount=typeCountsStr, time=totalTime,
</span><span class="lines">@@ -1475,13 +1475,13 @@
</span><span class="cx">
</span><span class="cx"> if numMissingGuids:
</span><span class="cx"> self.log.warn(
</span><del>- "{count!d} {type} records are missing {attr}",
</del><ins>+ "{count:d} {type} records are missing {attr}",
</ins><span class="cx"> count=numMissingGuids, type=recordType, attr=guidAttr
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if numMissingRecordNames:
</span><span class="cx"> self.log.warn(
</span><del>- "{count!d} {type} records are missing record name",
</del><ins>+ "{count:d} {type} records are missing record name",
</ins><span class="cx"> count=numMissingRecordNames, type=recordType,
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12713 => 12714)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-02-15 01:11:35 UTC (rev 12713)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-02-17 18:15:54 UTC (rev 12714)
</span><span class="lines">@@ -446,8 +446,8 @@
</span><span class="cx"> if self.txn is not None:
</span><span class="cx"> log.error(
</span><span class="cx"> "Transaction wait: {me.txn}, "
</span><del>- "Statements: {me.txn.statementCount!d}, "
- "IUDs: {me.txn.iudCount!d}, "
</del><ins>+ "Statements: {me.txn.statementCount:d}, "
+ "IUDs: {me.txn.iudCount:d}, "
</ins><span class="cx"> "Statement: {me.txn.currentStatement}",
</span><span class="cx"> me=self
</span><span class="cx"> )
</span><span class="lines">@@ -466,8 +466,8 @@
</span><span class="cx"> if self.txn is not None:
</span><span class="cx"> log.error(
</span><span class="cx"> "Transaction abort too long: {me.txn}, "
</span><del>- "Statements: {me.txn.statementCount!d}, "
- "IUDs: {me.txn.iudCount!d}, "
</del><ins>+ "Statements: {me.txn.statementCount:d}, "
+ "IUDs: {me.txn.iudCount:d}, "
</ins><span class="cx"> "Statement: {me.txn.currentStatement}",
</span><span class="cx"> me=self
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>