<!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>[15766] 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/15766">15766</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-14 07:03:11 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsprincipalspy">CalendarServer/trunk/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavicalendardirectoryservicepy">CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py</a></li>
<li><a href="#CalendarServertrunktxdavdpscommandspy">CalendarServer/trunk/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_directorypy">CalendarServer/trunk/txdav/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if config.Manhole.Enabled:
</span><del>- namespace= dict({service.name: service})
</del><ins>+ namespace = dict({service.name: service})
</ins><span class="cx"> for n, s in service.namedServices.iteritems():
</span><span class="cx"> namespace[n] = s
</span><span class="cx"> self._makeManhole(namespace=namespace, parent=service)
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx"> inherit=False
</span><span class="cx"> )
</span><span class="cx"> httpsService.setName(
</span><del>- "https-{}:{}".format(bindAddress,int(port)))
</del><ins>+ "https-{}:{}".format(bindAddress, int(port)))
</ins><span class="cx"> httpsService.setServiceParent(connectionService)
</span><span class="cx">
</span><span class="cx"> for port in config.BindHTTPPorts:
</span><span class="lines">@@ -1346,8 +1346,8 @@
</span><span class="cx"> "Set Manhole.UseSSH to false or rebuild CS with the "
</span><span class="cx"> "USE_OPENSSL environment variable set."
</span><span class="cx"> )
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> def makeService_Single(self, options):
</span><span class="cx"> """
</span><span class="cx"> Create a service to be used in a single-process, stand-alone
</span><span class="lines">@@ -1893,7 +1893,6 @@
</span><span class="cx"> statsService.setServiceParent(s)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Finally, let's get the real show on the road. Create a service that
</span><span class="cx"> # will spawn all of our worker processes when started, and wrap that
</span><span class="cx"> # service in zero to two necessary layers before it's started: first,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/principals.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/principals.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -603,10 +603,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_listGroupMembers(store, record):
</span><span class="cx"> members = yield record.members()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -339,6 +339,7 @@
</span><span class="cx"> raise ValueError("Invalid principal identifier: %s" % (principalID,))
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _addRemoveProxy(msg, fn, store, record, proxyType, *proxyIDs):
</span><span class="cx"> directory = store.directoryService()
</span><span class="lines">@@ -390,6 +391,7 @@
</span><span class="cx"> yield _addRemoveProxy("Removed", Delegates.removeDelegate, store, record, "read", *proxyIDs)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def setProxies(record, readProxyRecords, writeProxyRecords):
</span><span class="cx"> """
</span><span class="lines">@@ -438,6 +440,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def proxySubprincipal(principal, proxyType):
</span><span class="cx"> return principal.getChild("calendar-proxy-" + proxyType)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavicalendardirectoryservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/caldav/icalendardirectoryservice.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -114,7 +114,6 @@
</span><span class="cx"> @type autoScheduleMode: L{AutoScheduleMode}
</span><span class="cx"> """
</span><span class="cx">
</span><del>-
</del><span class="cx"> def isProxyFor(other): #@NoSelf
</span><span class="cx"> """
</span><span class="cx"> Test whether the record is a calendar user proxy for the specified record.
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/dps/commands.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -265,6 +265,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class SetAutoScheduleModeCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span><span class="lines">@@ -275,6 +276,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class FlushCommand(amp.Command):
</span><span class="cx"> arguments = []
</span><span class="cx"> response = [
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/dps/server.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -556,7 +556,6 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @GroupsCommand.responder
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def groups(self, uid):
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_directory.py (15765 => 15766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_directory.py 2016-07-13 21:23:08 UTC (rev 15765)
+++ CalendarServer/trunk/txdav/who/test/test_directory.py 2016-07-14 14:03:11 UTC (rev 15766)
</span><span class="lines">@@ -374,6 +374,7 @@
</span><span class="cx"> self.assertEquals(orion.autoScheduleMode, AutoScheduleMode.declineIfBusy)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DirectoryTestCaseFakeEmail(StoreTestCase):
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>