<!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>[12780] twext/branches/users/cdaboo/jobs</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/12780">12780</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-01 07:45:25 -0800 (Sat, 01 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge from trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twextbranchesuserscdaboojobsbin_buildsh">twext/branches/users/cdaboo/jobs/bin/_build.sh</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextenterprisedalmodelpy">twext/branches/users/cdaboo/jobs/twext/enterprise/dal/model.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhodirectorypy">twext/branches/users/cdaboo/jobs/twext/who/directory.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhoopendirectory_constantspy">twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_constants.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhoopendirectory_servicepy">twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhotesttest_directorypy">twext/branches/users/cdaboo/jobs/twext/who/test/test_directory.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhotesttest_utilpy">twext/branches/users/cdaboo/jobs/twext/who/test/test_util.py</a></li>
<li><a href="#twextbranchesuserscdaboojobstwextwhoutilpy">twext/branches/users/cdaboo/jobs/twext/who/util.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#twextbranchesuserscdaboojobs">twext/branches/users/cdaboo/jobs/</a></li>
<li><a href="#twextbranchesuserscdaboojobstwext">twext/branches/users/cdaboo/jobs/twext/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twextbranchesuserscdaboojobs"></a>
<div class="propset"><h4>Property changes: twext/branches/users/cdaboo/jobs</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="twextbranchesuserscdaboojobsbin_buildsh"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/bin/_build.sh (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/bin/_build.sh 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/bin/_build.sh 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -97,14 +97,18 @@
</span><span class="cx">
</span><span class="cx"> python="${py_bindir}/python";
</span><span class="cx">
</span><del>- project="$(setup_print name)";
-
</del><span class="cx"> if [ -z "${TWEXT_PKG_CACHE-}" ]; then
</span><span class="cx"> dep_packages="${dev_home}/pkg";
</span><span class="cx"> else
</span><span class="cx"> dep_packages="${TWEXT_PKG_CACHE}";
</span><span class="cx"> fi;
</span><span class="cx">
</span><ins>+ if [ ! -d "${py_root}" ]; then
+ "${bootstrap_python}" -m virtualenv "${py_root}";
+ fi;
+
+ project="$(setup_print name)";
+
</ins><span class="cx"> export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</span><span class="cx"> export _DEVELOP_PROJECT_="${project}";
</span><span class="cx">
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwext"></a>
<div class="propset"><h4>Property changes: twext/branches/users/cdaboo/jobs/twext</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/twext:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351/twext:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore/twext:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store/twext:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile/twext:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2/twext:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev/twext:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev/twext:11846
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699/twext:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692/twext:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes/twext:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twext:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule/twext:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace/twext:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim/twext:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json/twext:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments/twext:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591/twext:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464/twext:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks/twext:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods/twext:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar/twext:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard/twext:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes/twext:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070/twext:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods/twext:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187/twext:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store/twext:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling/twext:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones/twext:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging/twext:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3/twext:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error/twext:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid/twext:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit/twext:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge/twext:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify/twext:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect/twext:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild/twext:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux/twext:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota/twext:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres/twext:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests/twext:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix/twext:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html/twext:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client/twext:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests/twext:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups/twext:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge/twext:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes/twext:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6/twext:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7/twext:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete/twext:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export/twext:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api/twext:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle/twext:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls/twext:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html/twext:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim/twext:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade/twext:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twext:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q/twext:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing/twext:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota/twext:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport/twext:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes/twext:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2/twext:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool/twext:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api/twext:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones/twext:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store/twext:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop/twext:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions/twext:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias/twext:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport/twext:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked/twext:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted/twext:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize/twext:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups/twext:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed/twext:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files/twext:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush/twext:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems/twext:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources/twext:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2/twext:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events/twext:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038/twext:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066/twext:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2/twext:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing/twext:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations/twext:5515-5593
</span><span class="cx"> + /CalDAVTester/trunk/twext:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation/twext:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351/twext:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore/twext:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2/twext:5936-5981
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile/twext:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store/twext:5594-5934
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev/twext:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev/twext:11846
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699/twext:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692/twext:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes/twext:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twext:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule/twext:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace/twext:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim/twext:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json/twext:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments/twext:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591/twext:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464/twext:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks/twext:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods/twext:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar/twext:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard/twext:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes/twext:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070/twext:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods/twext:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187/twext:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store/twext:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling/twext:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones/twext:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging/twext:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3/twext:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error/twext:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid/twext:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit/twext:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge/twext:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify/twext:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect/twext:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild/twext:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux/twext:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota/twext:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres/twext:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests/twext:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix/twext:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html/twext:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client/twext:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis/twext:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests/twext:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups/twext:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge/twext:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes/twext:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6/twext:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7/twext:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete/twext:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export/twext:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api/twext:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls/twext:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle/twext:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html/twext:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim/twext:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade/twext:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1/twext:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q/twext:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing/twext:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota/twext:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport/twext:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes/twext:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2/twext:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool/twext:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api/twext:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones/twext:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store/twext:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop/twext:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions/twext:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias/twext:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport/twext:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked/twext:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted/twext:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize/twext:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups/twext:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed/twext:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files/twext:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush/twext:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems/twext:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2/twext:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources/twext:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events/twext:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038/twext:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066/twext:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2/twext:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing/twext:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations/twext:5515-5593
</span><span class="cx">/twext/trunk/twext:12742-12779
</span><a id="twextbranchesuserscdaboojobstwextenterprisedalmodelpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/enterprise/dal/model.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/enterprise/dal/model.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/enterprise/dal/model.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -321,10 +321,14 @@
</span><span class="cx"> otherColumns = dict([
</span><span class="cx"> (item.name.lower(), item) for item in other.columns
</span><span class="cx"> ])
</span><del>- for item in set(myColumns.keys()) ^ set(otherColumns.keys()):
</del><ins>+ for item in set(myColumns.keys()) - set(otherColumns.keys()):
</ins><span class="cx"> results.append(
</span><del>- "Table: %s, missing column: %s" % (self.name, item,)
</del><ins>+ "Table: %s, extra column: %s" % (self.name, myColumns[item].name,)
</ins><span class="cx"> )
</span><ins>+ for item in set(otherColumns.keys()) - set(myColumns.keys()):
+ results.append(
+ "Table: %s, missing column: %s" % (self.name, otherColumns[item].name,)
+ )
</ins><span class="cx">
</span><span class="cx"> for name in set(myColumns.keys()) & set(otherColumns.keys()):
</span><span class="cx"> results.extend(myColumns[name].compare(otherColumns[name]))
</span><span class="lines">@@ -593,13 +597,13 @@
</span><span class="cx"> ])
</span><span class="cx"> for item in set(myItems.keys()) - set(otherItems.keys()):
</span><span class="cx"> results.append(
</span><del>- "Schema: %s, missing %s: %s"
- % (other.filename, descriptor, item)
</del><ins>+ "Schema: %s, extra %s: %s"
+ % (other.filename, descriptor, myItems[item].name)
</ins><span class="cx"> )
</span><span class="cx"> for item in set(otherItems.keys()) - set(myItems.keys()):
</span><span class="cx"> results.append(
</span><span class="cx"> "Schema: %s, missing %s: %s"
</span><del>- % (self.filename, descriptor, item)
</del><ins>+ % (self.filename, descriptor, otherItems[item].name)
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for name in set(myItems.keys()) & set(otherItems.keys()):
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/directory.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/directory.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/directory.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> elif issubclass(expectedType, Names):
</span><span class="cx"> expectedType = NamedConstant
</span><span class="cx">
</span><del>- if not isinstance(value, expectedType):
</del><ins>+ if value is not None and not isinstance(value, expectedType):
</ins><span class="cx"> raise InvalidDirectoryRecordError(
</span><span class="cx"> "Value {0!r} for field {1} is not of type {2}".format(
</span><span class="cx"> value, name, expectedType
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhoopendirectory_constantspy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_constants.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_constants.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_constants.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -45,8 +45,15 @@
</span><span class="cx"> metaRecordName.description = u"meta record name"
</span><span class="cx"> metaRecordName.multiValue = False
</span><span class="cx">
</span><ins>+ memberUIDs = NamedConstant()
+ memberUIDs.description = u"member UIDs (excluding groups)"
+ memberUIDs.multiValue = True
</ins><span class="cx">
</span><ins>+ nestedGroupsUIDs = NamedConstant()
+ nestedGroupsUIDs.description = u"nested group member UIDs"
+ nestedGroupsUIDs.multiValue = True
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # OD constants
</span><span class="cx"> #
</span><span class="lines">@@ -159,6 +166,12 @@
</span><span class="cx"> metaRecordName = ValueConstant(u"dsAttrTypeStandard:AppleMetaRecordName")
</span><span class="cx"> metaRecordName.fieldName = FieldName.metaRecordName
</span><span class="cx">
</span><ins>+ groupMembers = ValueConstant(u"dsAttrTypeStandard:GroupMembers")
+ groupMembers.fieldName = FieldName.memberUIDs
+
+ nestedGroups = ValueConstant(u"dsAttrTypeStandard:NestedGroups")
+ nestedGroups.fieldName = FieldName.nestedGroupsUIDs
+
</ins><span class="cx"> # # Single value fields
</span><span class="cx"> # AdminLimits = ValueConstant(u"dsAttrTypeStandard:AdminLimits")
</span><span class="cx"> # AppleAliasData = ValueConstant(u"dsAttrTypeStandard:AppleAliasData")
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_service.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_service.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/opendirectory/_service.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> "GUID field is required.", fields
</span><span class="cx"> )
</span><span class="cx">
</span><del>- fields[service.fieldName.uid] = unicode(guid)
</del><ins>+ fields[service.fieldName.uid] = unicode(guid).upper()
</ins><span class="cx">
</span><span class="cx"> super(DirectoryRecord, self).__init__(service, fields)
</span><span class="cx"> self._odRecord = odRecord
</span><span class="lines">@@ -720,6 +720,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def members(self):
+ members = set()
+ for uid in getattr(self, "memberUIDs", ()):
+ members.add((yield self.service.recordWithUID(uid)))
+ for uid in getattr(self, "nestedGroupsUIDs", ()):
+ members.add((yield self.service.recordWithUID(uid)))
+ returnValue(members)
+
+
+
</ins><span class="cx"> class NoQOPDigestCredentialFactory(DigestCredentialFactory):
</span><span class="cx"> """
</span><span class="cx"> DigestCredentialFactory without qop, to interop with OD.
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/test/test_directory.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/test/test_directory.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/test/test_directory.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -588,6 +588,13 @@
</span><span class="cx"> FieldName.shortNames: (u"nobody",),
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ fields_none_password = {
+ FieldName.uid: u"UID:nobody",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: (u"nobody",),
+ FieldName.password: None,
+ }
+
</ins><span class="cx"> fields_staff = {
</span><span class="cx"> FieldName.uid: u"UID:staff",
</span><span class="cx"> FieldName.recordType: RecordType.group,
</span><span class="lines">@@ -732,6 +739,16 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_noneIsAllowed(self):
+ """
+ Verify a value of None is allowed
+ """
+ service = self.service()
+ record = self.makeRecord(self.fields_none_password, service=service)
+
+ self.assertEquals(record.password, None)
+
+
</ins><span class="cx"> def _test_containerClassFieldType(self, callback):
</span><span class="cx"> """
</span><span class="cx"> Scaffold for test_initWithContainerClassFieldType_*.
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhotesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/test/test_util.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/test/test_util.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/test/test_util.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -155,13 +155,20 @@
</span><span class="cx"> self.assertRaises(TypeError, ConstantsContainer, (Tools, Switches))
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_conflictingNames(self):
</del><ins>+ def test_conflictingNames_different(self):
</ins><span class="cx"> """
</span><del>- A container can't contain two constants with the same name.
</del><ins>+ A container can't contain two different constants with the same name.
</ins><span class="cx"> """
</span><span class="cx"> self.assertRaises(ValueError, ConstantsContainer, (Tools, Instruments))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_conflictingNames_same(self):
+ """
+ A container can combine containers which contain the same constants.
+ """
+ ConstantsContainer((Tools, Tools))
+
+
</ins><span class="cx"> def test_notConstantClass(self):
</span><span class="cx"> """
</span><span class="cx"> A container can't contain random classes.
</span></span></pre></div>
<a id="twextbranchesuserscdaboojobstwextwhoutilpy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/jobs/twext/who/util.py (12779 => 12780)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/jobs/twext/who/util.py 2014-03-01 15:42:17 UTC (rev 12779)
+++ twext/branches/users/cdaboo/jobs/twext/who/util.py 2014-03-01 15:45:25 UTC (rev 12780)
</span><span class="lines">@@ -79,21 +79,27 @@
</span><span class="cx"> if issubclass(self._constantsClass, ValueConstant):
</span><span class="cx"> self.lookupByValue = self._lookupByValue
</span><span class="cx">
</span><del>- if constant.name in self._constants:
</del><ins>+ if (
+ constant.name in self._constants and
+ self._constants[constant.name] is not constant
+ ):
</ins><span class="cx"> raise ValueError("Name conflict: {0}".format(constant.name))
</span><span class="cx">
</span><span class="cx"> self._constants[constant.name] = constant
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _addMethods(self, methods):
</span><del>- for name, value in methods:
</del><ins>+ for name, method in methods:
</ins><span class="cx"> if name[0] == "_":
</span><span class="cx"> continue
</span><span class="cx">
</span><del>- if name in self._constants or name in self._methods:
</del><ins>+ if (
+ name in self._constants or
+ (name in self._methods and self._methods[name] is not method)
+ ):
</ins><span class="cx"> raise ValueError("Name conflict: {0}".format(name))
</span><span class="cx">
</span><del>- self._methods[name] = value
</del><ins>+ self._methods[name] = method
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __getattr__(self, name):
</span></span></pre>
</div>
</div>
</body>
</html>