<!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>[13031] CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</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/13031">13031</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-28 13:56:44 -0700 (Fri, 28 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>lint</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13030 => 13031)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py        2014-03-28 19:55:42 UTC (rev 13030)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py        2014-03-28 20:56:44 UTC (rev 13031)
</span><span class="lines">@@ -29,7 +29,9 @@
</span><span class="cx"> from twisted.internet.protocol import ClientCreator
</span><span class="cx"> from twisted.protocols import amp
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><del>-from txdav.caldav.icalendardirectoryservice import ICalendarStoreDirectoryRecord
</del><ins>+from txdav.caldav.icalendardirectoryservice import (
+    ICalendarStoreDirectoryRecord
+)
</ins><span class="cx"> from txdav.common.idirectoryservice import IStoreDirectoryService
</span><span class="cx"> from txdav.dps.commands import (
</span><span class="cx">     RecordWithShortNameCommand, RecordWithUIDCommand, RecordWithGUIDCommand,
</span><span class="lines">@@ -61,7 +63,8 @@
</span><span class="cx"> ## LDAP
</span><span class="cx"> ## Tests from old twistedcaldav/directory
</span><span class="cx"> ## Cmd line tools
</span><del>-## Store based directory service (records in the store, i.e. locations/resources)
</del><ins>+## Store based directory service (records in the store, i.e.
+##    locations/resources)
</ins><span class="cx"> ## Separate store for DPS (augments and delegates separate from calendar data)
</span><span class="cx"> ## calverify needs deferreds, including:
</span><span class="cx"> ##    component.normalizeCalendarUserAddresses
</span><span class="lines">@@ -157,7 +160,9 @@
</span><span class="cx">         # path = &quot;data/Logs/state/directory-proxy.sock&quot;
</span><span class="cx">         if getattr(self, &quot;_connection&quot;, None) is None:
</span><span class="cx">             log.debug(&quot;Creating connection&quot;)
</span><del>-            connection = (yield ClientCreator(reactor, amp.AMP).connectUNIX(path))
</del><ins>+            connection = (
+                yield ClientCreator(reactor, amp.AMP).connectUNIX(path)
+            )
</ins><span class="cx">             self._connection = connection
</span><span class="cx">         else:
</span><span class="cx">             log.debug(&quot;Already have connection&quot;)
</span><span class="lines">@@ -241,8 +246,9 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def recordsMatchingTokens(self, tokens, context=None, limitResults=50,
-                              timeoutSeconds=10):
</del><ins>+    def recordsMatchingTokens(
+        self, tokens, context=None, limitResults=50, timeoutSeconds=10
+    ):
</ins><span class="cx">         return self._call(
</span><span class="cx">             RecordsMatchingTokensCommand,
</span><span class="cx">             self._processMultipleRecords,
</span><span class="lines">@@ -251,8 +257,9 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def recordsMatchingFields(self, fields, operand=Operand.OR, recordType=None):
-
</del><ins>+    def recordsMatchingFields(
+        self, fields, operand=Operand.OR, recordType=None
+    ):
</ins><span class="cx">         newFields = []
</span><span class="cx">         for fieldName, searchTerm, matchFlags, matchType in fields:
</span><span class="cx">             newFields.append(
</span><span class="lines">@@ -276,7 +283,10 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def recordsFromExpression(self, expression):
</span><del>-        raise NotImplementedError(&quot;This won't work until expressions are serializable to send across AMP&quot;)
</del><ins>+        raise NotImplementedError(
+            &quot;This won't work until expressions are serializable to send &quot;
+            &quot;across AMP&quot;
+        )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -370,22 +380,28 @@
</span><span class="cx">     if record:
</span><span class="cx">         authenticated = (yield record.verifyPlaintextPassword(&quot;negas&quot;))
</span><span class="cx">         print(&quot;plain auth: {a}&quot;.format(a=authenticated))
</span><del>-    &quot;&quot;&quot;
-    record = (yield ds.recordWithUID(&quot;__dre__&quot;))
-    print(&quot;uid: {r}&quot;.format(r=record))
-    if record:
-        authenticated = (yield record.verifyPlaintextPassword(&quot;erd&quot;))
-        print(&quot;plain auth: {a}&quot;.format(a=authenticated))
-    record = (yield ds.recordWithGUID(&quot;A3B1158F-0564-4F5B-81E4-A89EA5FF81B0&quot;))
-    print(&quot;guid: {r}&quot;.format(r=record))
-    records = (yield ds.recordsWithRecordType(RecordType.user))
-    print(&quot;recordType: {r}&quot;.format(r=records))
-    records = (yield ds.recordsWithEmailAddress(&quot;cdaboo@bitbucket.calendarserver.org&quot;))
-    print(&quot;emailAddress: {r}&quot;.format(r=records))
-    &quot;&quot;&quot;
</del><span class="cx"> 
</span><ins>+    # record = (yield ds.recordWithUID(&quot;__dre__&quot;))
+    # print(&quot;uid: {r}&quot;.format(r=record))
+    # if record:
+    #     authenticated = (yield record.verifyPlaintextPassword(&quot;erd&quot;))
+    #     print(&quot;plain auth: {a}&quot;.format(a=authenticated))
</ins><span class="cx"> 
</span><ins>+    # record = yield ds.recordWithGUID(
+    #     &quot;A3B1158F-0564-4F5B-81E4-A89EA5FF81B0&quot;
+    # )
+    # print(&quot;guid: {r}&quot;.format(r=record))
</ins><span class="cx"> 
</span><ins>+    # records = yield ds.recordsWithRecordType(RecordType.user)
+    # print(&quot;recordType: {r}&quot;.format(r=records))
+
+    # records = yield ds.recordsWithEmailAddress(
+    #     &quot;cdaboo@bitbucket.calendarserver.org&quot;
+    # )
+    # print(&quot;emailAddress: {r}&quot;.format(r=records))
+
+
+
</ins><span class="cx"> def succeeded(result):
</span><span class="cx">     print(&quot;yay&quot;)
</span><span class="cx">     reactor.stop()
</span></span></pre>
</div>
</div>

</body>
</html>