<!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>[13817] CalDAVTester/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/13817">13817</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 10:40:13 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkodsetuppy">CalDAVTester/trunk/odsetup.py</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
<li><a href="#CalDAVTestertrunksrcunittesttest_jsonPointerpy">CalDAVTester/trunk/src/unittest/test_jsonPointer.py</a></li>
<li><a href="#CalDAVTestertrunkverifiersfreeBusypy">CalDAVTester/trunk/verifiers/freeBusy.py</a></li>
<li><a href="#CalDAVTestertrunkverifierspostFreeBusypy">CalDAVTester/trunk/verifiers/postFreeBusy.py</a></li>
<li><a href="#CalDAVTestertrunkverifierspropfindItemspy">CalDAVTester/trunk/verifiers/propfindItems.py</a></li>
<li><a href="#CalDAVTestertrunkverifierspropfindValuespy">CalDAVTester/trunk/verifiers/propfindValues.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkodsetuppy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/odsetup.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/odsetup.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/odsetup.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> groupattrs = {
</span><del>- "dsAttrTypeStandard:RealName": "Group %02d",
</del><ins>+ "dsAttrTypeStandard:RealName": "Group %02d",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> records = (
</span><span class="lines">@@ -542,7 +542,8 @@
</span><span class="cx"> if user[0] in guids:
</span><span class="cx"> guids[user[0]] = guid
</span><span class="cx"> if path == "/Places":
</span><del>- cmd(cmdutility,
</del><ins>+ cmd(
+ cmdutility,
</ins><span class="cx"> locationcreatecmd % {
</span><span class="cx"> "guid": guid,
</span><span class="cx"> "realname": user[2]["dsAttrTypeStandard:RealName"],
</span><span class="lines">@@ -550,7 +551,8 @@
</span><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx"> elif path == "/Resources":
</span><del>- cmd(cmdutility,
</del><ins>+ cmd(
+ cmdutility,
</ins><span class="cx"> resourcecreatecmd % {
</span><span class="cx"> "guid": guid,
</span><span class="cx"> "realname": user[2]["dsAttrTypeStandard:RealName"],
</span><span class="lines">@@ -585,14 +587,16 @@
</span><span class="cx"> if user[0] not in locations:
</span><span class="cx"> return
</span><span class="cx"> guid = locations[user[0]]
</span><del>- cmd(cmdutility,
</del><ins>+ cmd(
+ cmdutility,
</ins><span class="cx"> locationremovecmd % {"guid": guid, }
</span><span class="cx"> )
</span><span class="cx"> elif path == "/Resources":
</span><span class="cx"> if user[0] not in resources:
</span><span class="cx"> return
</span><span class="cx"> guid = resources[user[0]]
</span><del>- cmd(cmdutility,
</del><ins>+ cmd(
+ cmdutility,
</ins><span class="cx"> resourceremovecmd % {"guid": guid, }
</span><span class="cx"> )
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/caldavtest.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -566,8 +566,10 @@
</span><span class="cx">
</span><span class="cx"> # Special for GETCHANGED
</span><span class="cx"> if req.method == "GETCHANGED":
</span><del>- if not self.dowaitchanged(uri, etags[uri], req.user, req.pswd,
- label=label):
</del><ins>+ if not self.dowaitchanged(
+ uri, etags[uri], req.user, req.pswd,
+ label=label
+ ):
</ins><span class="cx"> return False, "Resource did not change", None, None
</span><span class="cx"> method = "GET"
</span><span class="cx">
</span><span class="lines">@@ -578,7 +580,7 @@
</span><span class="cx"> # Do the http request
</span><span class="cx"> http = SmartHTTPConnection(req.host, req.port, self.manager.server_info.ssl)
</span><span class="cx">
</span><del>- if not 'User-Agent' in headers and label is not None:
</del><ins>+ if 'User-Agent' not in headers and label is not None:
</ins><span class="cx"> headers['User-Agent'] = label.encode("utf-8")
</span><span class="cx">
</span><span class="cx"> try:
</span></span></pre></div>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/request.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -265,13 +265,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if details.get('qop'):
</span><del>- response = ('Digest username="%s", realm="%s", '
- 'nonce="%s", uri="%s", '
- 'response=%s, algorithm=%s, cnonce="%s", qop=%s, nc=%s' % (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'), details.get('cnonce'), details.get('qop'), details.get('nc'),))
</del><ins>+ response = (
+ 'Digest username="%s", realm="%s", '
+ 'nonce="%s", uri="%s", '
+ 'response=%s, algorithm=%s, cnonce="%s", qop=%s, nc=%s' %
+ (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'), details.get('cnonce'), details.get('qop'), details.get('nc'),)
+ )
</ins><span class="cx"> else:
</span><del>- response = ('Digest username="%s", realm="%s", '
- 'nonce="%s", uri="%s", '
- 'response=%s, algorithm=%s' % (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'),))
</del><ins>+ response = (
+ 'Digest username="%s", realm="%s", '
+ 'nonce="%s", uri="%s", '
+ 'response=%s, algorithm=%s' %
+ (user, details.get('realm'), details.get('nonce'), self.getURI(si), digest, details.get('algorithm'),)
+ )
</ins><span class="cx">
</span><span class="cx"> return response
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalDAVTestertrunksrcunittesttest_jsonPointerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/unittest/test_jsonPointer.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/unittest/test_jsonPointer.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/src/unittest/test_jsonPointer.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> (
</span><span class="cx"> "/",
</span><span class="cx"> '{"1":"foo", "2": "bar"}',
</span><del>- [{"1":"foo", "2": "bar"}, ],
</del><ins>+ [{"1": "foo", "2": "bar"}, ],
</ins><span class="cx"> ),
</span><span class="cx"> (
</span><span class="cx"> "/.",
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersfreeBusypy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/freeBusy.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/freeBusy.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/freeBusy.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -73,9 +73,11 @@
</span><span class="cx"> raise ValueError("Unknown FBTYPE: %s" % (fbtype,))
</span><span class="cx">
</span><span class="cx"> # Set sizes must match
</span><del>- if ((len(busy) != len(busyp)) or
</del><ins>+ if (
+ (len(busy) != len(busyp)) or
</ins><span class="cx"> (len(unavailable) != len(unavailablep)) or
</span><del>- (len(tentative) != len(tentativep))):
</del><ins>+ (len(tentative) != len(tentativep))
+ ):
</ins><span class="cx"> raise ValueError("Period list sizes do not match.")
</span><span class="cx">
</span><span class="cx"> # Convert to string sets
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierspostFreeBusypy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/postFreeBusy.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/postFreeBusy.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/postFreeBusy.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> # Must be VFREEBUSY
</span><span class="cx"> fb = comps[0]
</span><span class="cx">
</span><del>- # Check for attendee value
</del><ins>+ # Check for attendee value
</ins><span class="cx"> for attendee in fb.getProperties("ATTENDEE"):
</span><span class="cx"> if attendee.getValue().getValue() in users:
</span><span class="cx"> users.remove(attendee.getValue().getValue())
</span><span class="lines">@@ -92,9 +92,11 @@
</span><span class="cx"> raise ValueError("Unknown FBTYPE: %s" % (fbtype,))
</span><span class="cx">
</span><span class="cx"> # Set sizes must match
</span><del>- if ((len(busy) != len(busyp)) or
</del><ins>+ if (
+ (len(busy) != len(busyp)) or
</ins><span class="cx"> (len(unavailable) != len(unavailablep)) or
</span><del>- (len(tentative) != len(tentativep))):
</del><ins>+ (len(tentative) != len(tentativep))
+ ):
</ins><span class="cx"> raise ValueError("Period list sizes do not match.")
</span><span class="cx">
</span><span class="cx"> # Convert to string sets
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierspropfindItemspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/propfindItems.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/propfindItems.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/propfindItems.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> for i in range(len(okprops)):
</span><span class="cx"> p = okprops[i]
</span><span class="cx"> if (p.find("$") != -1):
</span><del>- if p.find("$") != len(p) - 1:
</del><ins>+ if p.find("$") != len(p) - 1:
</ins><span class="cx"> ok_props_match.append((p.split("$")[0], normalizeXML(p.split("$")[1])))
</span><span class="cx"> else:
</span><span class="cx"> ok_props_match.append((p.split("$")[0], None))
</span><span class="cx"> elif (p.find("!") != -1):
</span><del>- if p.find("!") != len(p) - 1:
</del><ins>+ if p.find("!") != len(p) - 1:
</ins><span class="cx"> okprops_nomatch[p.split("!")[0]] = normalizeXML(p.split("!")[1])
</span><span class="cx"> else:
</span><span class="cx"> okprops_nomatch[p.split("!")[0]] = None
</span></span></pre></div>
<a id="CalDAVTestertrunkverifierspropfindValuespy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/propfindValues.py (13816 => 13817)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/propfindValues.py 2014-08-01 17:11:32 UTC (rev 13816)
+++ CalDAVTester/trunk/verifiers/propfindValues.py 2014-08-01 17:40:13 UTC (rev 13817)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> else:
</span><span class="cx"> props_match.append((p.split("$")[0], "", True))
</span><span class="cx"> elif (p.find("!") != -1):
</span><del>- if p.find("!") != len(p) - 1:
</del><ins>+ if p.find("!") != len(p) - 1:
</ins><span class="cx"> props_match.append((p.split("!")[0], normalizeXML(p.split("!")[1]), False))
</span><span class="cx"> else:
</span><span class="cx"> props_match.append((p.split("!")[0], "", False))
</span></span></pre>
</div>
</div>
</body>
</html>