<!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>[12644] CalendarServer/trunk/txdav</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/12644">12644</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 06:56:20 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cosmetic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.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="#CalendarServertrunktxdavwhoidirectorypy">CalendarServer/trunk/txdav/who/idirectory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (12643 => 12644)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-02-11 14:56:20 UTC (rev 12644)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> @type command: L{twisted.protocols.amp.Command}
</span><span class="cx">
</span><span class="cx"> @param postProcess: a callable which takes the AMP response dictionary
</span><del>- and peforms any required massaging of the results, returning a
</del><ins>+ and performs any required massaging of the results, returning a
</ins><span class="cx"> L{Deferred} which fires with the post-processed results
</span><span class="cx"> @type postProcess: callable
</span><span class="cx"> """
</span><span class="lines">@@ -227,11 +227,13 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def succeeded(result):
</span><span class="cx"> print("yay")
</span><span class="cx"> reactor.stop()
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def failed(failure):
</span><span class="cx"> print("boo: {f}".format(f=failure))
</span><span class="cx"> reactor.stop()
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (12643 => 12644)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-02-11 14:56:20 UTC (rev 12644)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordWithUIDCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span><span class="lines">@@ -36,6 +37,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordWithGUIDCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('guid', amp.String()),
</span><span class="lines">@@ -45,6 +47,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordsWithRecordTypeCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('recordType', amp.String()),
</span><span class="lines">@@ -54,6 +57,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RecordsWithEmailAddressCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('emailAddress', amp.String()),
</span><span class="lines">@@ -63,6 +67,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class UpdateRecordsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('fieldsList', amp.String()),
</span><span class="lines">@@ -73,6 +78,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RemoveRecordsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uids', amp.ListOf(amp.String())),
</span><span class="lines">@@ -82,6 +88,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class VerifyPlaintextPasswordCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span><span class="lines">@@ -92,6 +99,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class VerifyHTTPDigestCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (12643 => 12644)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-02-11 14:56:20 UTC (rev 12644)
</span><span class="lines">@@ -210,7 +210,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class DirectoryProxyAMPFactory(Factory):
</span><span class="cx"> """
</span><span class="cx"> """
</span><span class="lines">@@ -220,13 +219,12 @@
</span><span class="cx"> def __init__(self, directory):
</span><span class="cx"> self._directory = directory
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def buildProtocol(self, addr):
</span><span class="cx"> return DirectoryProxyAMPProtocol(self._directory)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> class DirectoryProxyOptions(Options):
</span><span class="cx"> optParameters = [[
</span><span class="cx"> "config", "f", DEFAULT_CONFIG_FILE, "Path to configuration file."
</span><span class="lines">@@ -292,7 +290,7 @@
</span><span class="cx"> def opt_option(self, option):
</span><span class="cx"> """
</span><span class="cx"> Set an option to override a value in the config file. True, False, int,
</span><del>- and float options are supported, as well as comma seperated lists. Only
</del><ins>+ and float options are supported, as well as comma separated lists. Only
</ins><span class="cx"> one option may be given for each --option flag, however multiple
</span><span class="cx"> --option flags may be specified.
</span><span class="cx"> """
</span><span class="lines">@@ -316,6 +314,7 @@
</span><span class="cx"> self.parent['pidfile'] = None
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @implementer(IPlugin, service.IServiceMaker)
</span><span class="cx"> class DirectoryProxyServiceMaker(object):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/idirectory.py (12643 => 12644)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/idirectory.py 2014-02-11 04:08:40 UTC (rev 12643)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-02-11 14:56:20 UTC (rev 12644)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> from __future__ import absolute_import
</span><span class="cx">
</span><span class="cx"> """
</span><del>-Calendar and contacts directory extentions to L{twext.who.idirectory}.
</del><ins>+Calendar and contacts directory extensions to L{twext.who.idirectory}.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> location = NamedConstant()
</span><del>- location.description = u"location"
</del><ins>+ location.description = u"location"
</ins><span class="cx">
</span><span class="cx"> resource = NamedConstant()
</span><span class="cx"> resource.description = u"resource"
</span></span></pre>
</div>
</div>
</body>
</html>