<!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>[13657] CalendarServer/branches/users/sagen/recordtypes-2</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/13657">13657</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 14:09:57 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pull up branch changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2contribodtesttest_livepy">CalendarServer/branches/users/sagen/recordtypes-2/contrib/od/test/test_live.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2requirementsstabletxt">CalendarServer/branches/users/sagen/recordtypes-2/requirements-stable.txt</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2txdavdpsclientpy">CalendarServer/branches/users/sagen/recordtypes-2/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2txdavwhoaugmentpy">CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/augment.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2txdavwhodelegatespy">CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/delegates.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2txdavwhodirectorypy">CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2txdavwhowikipy">CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/wiki.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenrecordtypes2">CalendarServer/branches/users/sagen/recordtypes-2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenrecordtypes2"></a>
<div class="propset"><h4>Property changes: CalendarServer/branches/users/sagen/recordtypes-2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><a id="CalendarServerbranchesuserssagenrecordtypes2contribodtesttest_livepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/contrib/od/test/test_live.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/contrib/od/test/test_live.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/contrib/od/test/test_live.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -40,7 +40,16 @@
</span><span class="cx"> from twext.who.expression import (
</span><span class="cx"> CompoundExpression, Operand, MatchExpression, MatchType
</span><span class="cx"> )
</span><ins>+ from twext.who.idirectory import QueryNotSupportedError
+ from txdav.who.directory import CalendarDirectoryServiceMixin
+ from txdav.who.opendirectory import DirectoryService as OpenDirectoryService
+ from twext.who.expression import (
+ Operand, MatchType, MatchFlags, MatchExpression
+ )
</ins><span class="cx">
</span><ins>+ class CalOpenDirectoryService(OpenDirectoryService, CalendarDirectoryServiceMixin):
+ pass
+
</ins><span class="cx"> LOCAL_SHORTNAMES = "odtestalbert odtestbill odtestcarl odtestdavid odtestsubgroupa".split()
</span><span class="cx"> NETWORK_SHORTNAMES = "odtestamanda odtestbetty odtestcarlene odtestdenise odtestsubgroupb odtestgrouptop".split()
</span><span class="cx">
</span><span class="lines">@@ -160,18 +169,119 @@
</span><span class="cx"> # We should get back users and groups since we did not specify a type:
</span><span class="cx"> self.verifyResults(
</span><span class="cx"> records,
</span><del>- ["odtestbetty", "odtestalbert", "anotherodtestalbert", "odtestgroupbetty", "odtestgroupalbert"],
</del><ins>+ [
+ "odtestbetty", "odtestalbert", "anotherodtestalbert",
+ "odtestgroupbetty", "odtestgroupalbert"
+ ],
</ins><span class="cx"> ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb"]
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @onlyIfPopulated
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_compoundWithSingleRecordType(self):
</del><ins>+ def test_compoundWithExplicitRecordType(self):
</ins><span class="cx"> expression = CompoundExpression(
</span><span class="cx"> [
</span><span class="cx"> CompoundExpression(
</span><span class="cx"> [
</span><ins>+ MatchExpression(
+ self.service.fieldName.fullNames, u"be",
+ matchType=MatchType.contains
+ ),
+ MatchExpression(
+ self.service.fieldName.emailAddresses, u"be",
+ matchType=MatchType.startsWith
+ ),
+ ],
+ Operand.OR
+ ),
+ CompoundExpression(
+ [
+ MatchExpression(
+ self.service.fieldName.fullNames, u"test",
+ matchType=MatchType.contains
+ ),
+ MatchExpression(
+ self.service.fieldName.emailAddresses, u"test",
+ matchType=MatchType.startsWith
+ ),
+ ],
+ Operand.OR
+ ),
+ ],
+ Operand.AND
+ )
+ records = yield self.service.recordsFromExpression(
+ expression, recordTypes=[self.service.recordType.user]
+ )
+
+ # We should get back users but not groups:
+ self.verifyResults(
+ records,
+ ["odtestbetty", "odtestalbert", "anotherodtestalbert"],
+ ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb"]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_compoundWithMultipleExplicitRecordTypes(self):
+ expression = CompoundExpression(
+ [
+ CompoundExpression(
+ [
+ MatchExpression(
+ self.service.fieldName.fullNames, u"be",
+ matchType=MatchType.contains
+ ),
+ MatchExpression(
+ self.service.fieldName.emailAddresses, u"be",
+ matchType=MatchType.startsWith
+ ),
+ ],
+ Operand.OR
+ ),
+ CompoundExpression(
+ [
+ MatchExpression(
+ self.service.fieldName.fullNames, u"test",
+ matchType=MatchType.contains
+ ),
+ MatchExpression(
+ self.service.fieldName.emailAddresses, u"test",
+ matchType=MatchType.startsWith
+ ),
+ ],
+ Operand.OR
+ ),
+ ],
+ Operand.AND
+ )
+ records = yield self.service.recordsFromExpression(
+ expression, recordTypes=[
+ self.service.recordType.user,
+ self.service.recordType.group
+ ]
+ )
+
+ # We should get back users and groups:
+ self.verifyResults(
+ records,
+ [
+ "odtestbetty", "odtestalbert", "anotherodtestalbert",
+ "odtestgroupbetty", "odtestgroupalbert"
+ ],
+ ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb"]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_compoundWithEmbeddedSingleRecordType(self):
+ expression = CompoundExpression(
+ [
+ CompoundExpression(
+ [
</ins><span class="cx"> CompoundExpression(
</span><span class="cx"> [
</span><span class="cx"> MatchExpression(
</span><span class="lines">@@ -207,19 +317,17 @@
</span><span class="cx"> ],
</span><span class="cx"> Operand.AND
</span><span class="cx"> )
</span><del>- records = yield self.service.recordsFromExpression(expression)
</del><ins>+ try:
+ records = yield self.service.recordsFromExpression(expression)
+ except QueryNotSupportedError:
+ pass
+ else:
+ self.fail("This should have raised")
</ins><span class="cx">
</span><del>- # We should only get users back, not groups:
- self.verifyResults(
- records,
- ["odtestbetty", "odtestalbert", "anotherodtestalbert"],
- ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb", "odtestgroupbetty", "odtestgroupalbert"]
- )
</del><span class="cx">
</span><del>-
</del><span class="cx"> @onlyIfPopulated
</span><span class="cx"> @inlineCallbacks
</span><del>- def test_compoundWithMultipleRecordTypes(self):
</del><ins>+ def test_compoundWithEmbeddedMultipleRecordTypes(self):
</ins><span class="cx"> expression = CompoundExpression(
</span><span class="cx"> [
</span><span class="cx"> CompoundExpression(
</span><span class="lines">@@ -267,13 +375,135 @@
</span><span class="cx"> ],
</span><span class="cx"> Operand.AND
</span><span class="cx"> )
</span><del>- records = yield self.service.recordsFromExpression(expression)
</del><span class="cx">
</span><del>- # We should get users and groups back, since we asked for either type:
</del><ins>+ try:
+ records = yield self.service.recordsFromExpression(expression)
+ except QueryNotSupportedError:
+ pass
+ else:
+ self.fail("This should have raised")
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingTokens(self):
+ self.calService = CalOpenDirectoryService()
+ records = yield self.calService.recordsMatchingTokens([u"be", u"test"])
</ins><span class="cx"> self.verifyResults(
</span><span class="cx"> records,
</span><del>- ["odtestbetty", "odtestalbert", "anotherodtestalbert", "odtestgroupbetty", "odtestgroupalbert"],
</del><ins>+ [
+ "odtestbetty", "odtestalbert", "anotherodtestalbert",
+ "odtestgroupbetty", "odtestgroupalbert"
+ ],
</ins><span class="cx"> ["odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb"]
</span><span class="cx"> )
</span><span class="cx">
</span><del>- test_compoundWithMultipleRecordTypes.skip = "This ends up doing a brute force query!"
</del><ins>+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingTokensWithContextUser(self):
+ self.calService = CalOpenDirectoryService()
+ records = yield self.calService.recordsMatchingTokens(
+ [u"be", u"test"],
+ context=self.calService.searchContext_user
+ )
+ self.verifyResults(
+ records,
+ [
+ "odtestbetty", "odtestalbert", "anotherodtestalbert",
+ ],
+ [
+ "odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb",
+ "odtestgroupbetty", "odtestgroupalbert"
+ ]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingTokensWithContextGroup(self):
+ self.calService = CalOpenDirectoryService()
+ records = yield self.calService.recordsMatchingTokens(
+ [u"be", u"test"],
+ context=self.calService.searchContext_group
+ )
+ self.verifyResults(
+ records,
+ [
+ "odtestgroupbetty", "odtestgroupalbert"
+ ],
+ [
+ "odtestamanda", "odtestbill", "odtestgroupa", "odtestgroupb",
+ "odtestbetty", "odtestalbert", "anotherodtestalbert"
+ ]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingMultipleFieldsNoRecordType(self):
+ self.calService = CalOpenDirectoryService()
+ fields = (
+ (u"fullNames", u"be", MatchFlags.caseInsensitive, MatchType.contains),
+ (u"fullNames", u"test", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.calService.recordsMatchingFields(
+ fields, operand=Operand.AND, recordType=None
+ ))
+ self.verifyResults(
+ records,
+ [
+ "odtestgroupbetty", "odtestgroupalbert",
+ "odtestbetty", "odtestalbert", "anotherodtestalbert"
+ ],
+ [
+ "odtestamanda",
+ ]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingSingleFieldNoRecordType(self):
+ self.calService = CalOpenDirectoryService()
+ fields = (
+ (u"fullNames", u"test", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.calService.recordsMatchingFields(
+ fields, operand=Operand.AND, recordType=None
+ ))
+ print("final records", records)
+ self.verifyResults(
+ records,
+ [
+ "odtestgroupbetty", "odtestgroupalbert",
+ "odtestbetty", "odtestalbert", "anotherodtestalbert",
+ "odtestamanda",
+ ],
+ [
+ "nobody",
+ ]
+ )
+
+
+ @onlyIfPopulated
+ @inlineCallbacks
+ def test_recordsMatchingFieldsWithRecordType(self):
+ self.calService = CalOpenDirectoryService()
+ fields = (
+ (u"fullNames", u"be", MatchFlags.caseInsensitive, MatchType.contains),
+ (u"fullNames", u"test", MatchFlags.caseInsensitive, MatchType.contains),
+ )
+ records = (yield self.calService.recordsMatchingFields(
+ fields, operand=Operand.AND, recordType=self.calService.recordType.user
+ ))
+ self.verifyResults(
+ records,
+ [
+ "odtestbetty", "odtestalbert", "anotherodtestalbert"
+ ],
+ [
+ "odtestamanda", "odtestgroupalbert", "odtestgroupbetty",
+ ]
+ )
+
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2requirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/requirements-stable.txt (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/requirements-stable.txt 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/requirements-stable.txt 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13640#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/sagen/recordtypes@13652#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13621#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/txdav/dps/client.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/txdav/dps/client.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/txdav/dps/client.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def recordsFromExpression(self, expression):
</del><ins>+ def recordsFromExpression(self, expression, recordTypes=None):
</ins><span class="cx"> raise NotImplementedError(
</span><span class="cx"> "This won't work until expressions are serializable to send "
</span><span class="cx"> "across AMP"
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2txdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/augment.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/augment.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/augment.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -133,8 +133,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def recordsFromExpression(self, expression):
- records = yield self._directory.recordsFromExpression(expression)
</del><ins>+ def recordsFromExpression(self, expression, recordTypes=None):
+ records = yield self._directory.recordsFromExpression(
+ expression, recordTypes=recordTypes
+ )
</ins><span class="cx"> augmented = []
</span><span class="cx"> for record in records:
</span><span class="cx"> record = yield self._augment(record)
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2txdavwhodelegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/delegates.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/delegates.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/delegates.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def recordsFromExpression(self, expression, records=None):
</del><ins>+ def recordsFromExpression(self, expression, recordTypes=None, records=None):
</ins><span class="cx"> """
</span><span class="cx"> It's only ever appropriate to look up delegate group record by
</span><span class="cx"> shortName or uid. When wrapped by an aggregate directory, looking up
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/directory.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/directory.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/directory.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -182,36 +182,16 @@
</span><span class="cx"> # CompoundExpression that ANDs the original expression with a
</span><span class="cx"> # typeSpecific one. Collect all the results from these expressions.
</span><span class="cx"> recordTypes = self.recordTypesForSearchContext(context)
</span><del>- log.debug("Tokens: {t}, recordTypes {r}", t=tokens, r=recordTypes)
- for recordType in recordTypes:
- typeSpecific = MatchExpression(
- self.fieldName.recordType,
- recordType,
- MatchType.equals,
- MatchFlags.none
- )
-
- typeSpecific = CompoundExpression(
- [expression, typeSpecific],
- Operand.AND
- )
-
- subResults = yield self.recordsFromExpression(typeSpecific)
- log.debug(
- "Tokens ({t}) matched {n} of {r}",
- t=tokens, n=len(subResults), r=recordType
- )
- results.extend(subResults)
-
</del><span class="cx"> else:
</span><del>- # No record type limits
- results = yield self.recordsFromExpression(expression)
- log.debug(
- "Tokens ({t}) matched {n} records",
- t=tokens, n=len(results)
- )
</del><ins>+ recordTypes = None
</ins><span class="cx">
</span><del>- log.debug("Tokens ({t}) matched records {r}", t=tokens, r=results)
</del><ins>+ results = yield self.recordsFromExpression(
+ expression, recordTypes=recordTypes
+ )
+ log.debug(
+ "Tokens ({t}) matched {n} records",
+ t=tokens, n=len(results)
+ )
</ins><span class="cx">
</span><span class="cx"> returnValue(results)
</span><span class="cx">
</span><span class="lines">@@ -255,36 +235,17 @@
</span><span class="cx"> subExpressions.append(subExpression)
</span><span class="cx">
</span><span class="cx"> if len(subExpressions) == 1:
</span><del>- # FIXME: twext.who.opendirectory takes a CompoundExpression and
- # inspects it for MatchExpressions on recordType, and pulls those
- # out of the query structure. However, if all that remains is
- # essentially a MatchExpression, but we tell OD to use
- # ODMatchType.compound for it, we get no results back. Until we
- # fix twext.who, this workaround keeds the query compound even
- # when the record type portion is removed:
- expression = CompoundExpression(
- [subExpressions[0], subExpressions[0]], operand
- )
</del><ins>+ expression = subExpressions[0]
</ins><span class="cx"> else:
</span><span class="cx"> expression = CompoundExpression(subExpressions, operand)
</span><span class="cx">
</span><del>- # AND in the recordType if passed in
</del><span class="cx"> if recordType is not None:
</span><del>- typeExpression = MatchExpression(
- self.fieldName.recordType,
- recordType,
- MatchType.equals,
- MatchFlags.none
- )
- expression = CompoundExpression(
- [
- expression,
- typeExpression
- ],
- Operand.AND
- )
- return self.recordsFromExpression(expression)
</del><ins>+ recordTypes = [recordType]
+ else:
+ recordTypes = None
+ return self.recordsFromExpression(expression, recordTypes=recordTypes)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> _oldRecordTypeNames = {
</span><span class="cx"> "address": "addresses",
</span><span class="cx"> "group": "groups",
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenrecordtypes2txdavwhowikipy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/wiki.py (13656 => 13657)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/wiki.py 2014-06-18 21:06:08 UTC (rev 13656)
+++ CalendarServer/branches/users/sagen/recordtypes-2/txdav/who/wiki.py 2014-06-18 21:09:57 UTC (rev 13657)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><del>- def recordsFromExpression(self, expression, records=None):
</del><ins>+ def recordsFromExpression(self, expression, recordTypes=None, records=None):
</ins><span class="cx"> return succeed(())
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>