<!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>[12471] twext/trunk/twext/who</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/12471">12471</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-29 18:27:24 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor clean up of XML service.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhotesttest_aggregatepy">twext/trunk/twext/who/test/test_aggregate.py</a></li>
<li><a href="#twexttrunktwextwhoxmlpy">twext/trunk/twext/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhotesttest_aggregatepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_aggregate.py (12470 => 12471)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_aggregate.py        2014-01-30 01:06:28 UTC (rev 12470)
+++ twext/trunk/twext/who/test/test_aggregate.py        2014-01-30 02:27:24 UTC (rev 12471)
</span><span class="lines">@@ -24,12 +24,13 @@
</span><span class="cx"> from ..idirectory import IDirectoryService, DirectoryConfigurationError
</span><span class="cx"> from ..directory import DirectoryRecord
</span><span class="cx"> from ..aggregate import DirectoryService
</span><ins>+from ..xml import RecordTypeValue
</ins><span class="cx"> from ..util import ConstantsContainer
</span><span class="cx"> from . import test_directory, test_xml
</span><span class="cx"> from .test_xml import (
</span><span class="cx"> BaseTest as XMLBaseTest,
</span><span class="cx"> QueryMixIn, xmlService, TestService as XMLTestService,
</span><del>- DirectoryServiceConvenienceTestMixIn
</del><ins>+ DirectoryServiceConvenienceTestMixIn,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (12470 => 12471)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py        2014-01-30 01:06:28 UTC (rev 12470)
+++ twext/trunk/twext/who/xml.py        2014-01-30 02:27:24 UTC (rev 12471)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> from .idirectory import (
</span><span class="cx"> DirectoryServiceError,
</span><span class="cx"> NoSuchRecordError, UnknownRecordTypeError,
</span><del>- RecordType, FieldName as BaseFieldName,
</del><ins>+ RecordType as BaseRecordType, FieldName as BaseFieldName,
</ins><span class="cx"> )
</span><span class="cx"> from .index import (
</span><span class="cx"> DirectoryService as BaseDirectoryService,
</span><span class="lines">@@ -103,21 +103,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class Value(Values):
</del><ins>+class RecordTypeValue(Values):
</ins><span class="cx"> #
</span><del>- # Booleans
- #
- true = ValueConstant(u"true")
- false = ValueConstant(u"false")
-
- #
</del><span class="cx"> # Record types
</span><span class="cx"> #
</span><span class="cx"> user = ValueConstant(u"user")
</span><del>- user.recordType = RecordType.user
</del><ins>+ user.recordType = BaseRecordType.user
</ins><span class="cx">
</span><span class="cx"> group = ValueConstant(u"group")
</span><del>- group.recordType = RecordType.group
</del><ins>+ group.recordType = BaseRecordType.group
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -130,11 +124,14 @@
</span><span class="cx"> XML directory service.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- recordType = ConstantsContainer((RecordType.user, RecordType.group))
</del><ins>+ recordType = ConstantsContainer(
+ (BaseRecordType.user, BaseRecordType.group)
+ )
</ins><span class="cx">
</span><del>- element = Element
- attribute = Attribute
- value = Value
</del><ins>+ # XML schema constants
+ element = Element
+ attribute = Attribute
+ recordTypeValue = RecordTypeValue
</ins><span class="cx">
</span><span class="cx"> refreshInterval = 4
</span><span class="cx">
</span><span class="lines">@@ -287,7 +284,9 @@
</span><span class="cx"> if recordTypeAttribute:
</span><span class="cx"> try:
</span><span class="cx"> recordType = (
</span><del>- self.value.lookupByValue(recordTypeAttribute).recordType
</del><ins>+ self.recordTypeValue
+ .lookupByValue(recordTypeAttribute)
+ .recordType
</ins><span class="cx"> )
</span><span class="cx"> except (ValueError, AttributeError):
</span><span class="cx"> raise UnknownRecordTypeError(recordTypeAttribute)
</span><span class="lines">@@ -354,10 +353,8 @@
</span><span class="cx">
</span><span class="cx"> # Index the record type -> attribute mappings.
</span><span class="cx"> recordTypes = {}
</span><del>- for valueName in self.value.iterconstants():
- recordType = getattr(valueName, "recordType", None)
- if recordType is not None:
- recordTypes[recordType] = valueName.value
</del><ins>+ for valueName in self.recordTypeValue.iterconstants():
+ recordTypes[valueName.recordType] = valueName.value
</ins><span class="cx"> del valueName
</span><span class="cx">
</span><span class="cx"> # Index the field name -> element mappings.
</span></span></pre>
</div>
</div>
</body>
</html>