<!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>[12583] 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/12583">12583</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 16:45:30 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>.valueType on a field now expects a container for constants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
<li><a href="#twexttrunktwextwhoidirectorypy">twext/trunk/twext/who/idirectory.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="twexttrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/directory.py (12582 => 12583)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py 2014-02-06 00:17:39 UTC (rev 12582)
+++ twext/trunk/twext/who/directory.py 2014-02-06 00:45:30 UTC (rev 12583)
</span><span class="lines">@@ -26,6 +26,11 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface import implementer, directlyProvides
</span><span class="cx">
</span><ins>+from twisted.python.constants import (
+ Names, NamedConstant,
+ Values, ValueConstant,
+ Flags, FlagConstant,
+)
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.internet.defer import succeed, fail
</span><span class="cx"> from twisted.cred.credentials import DigestedCredentials
</span><span class="lines">@@ -352,6 +357,14 @@
</span><span class="cx">
</span><span class="cx"> def checkType(name, value):
</span><span class="cx"> expectedType = service.fieldName.valueType(name)
</span><ins>+
+ if issubclass(expectedType, Names):
+ expectedType = NamedConstant
+ elif issubclass(expectedType, Values):
+ expectedType = ValueConstant
+ elif issubclass(expectedType, Flags):
+ expectedType = FlagConstant
+
</ins><span class="cx"> if not isinstance(value, expectedType):
</span><span class="cx"> raise InvalidDirectoryRecordError(
</span><span class="cx"> "Value {0!r} for field {1} is not of type {2}".format(
</span></span></pre></div>
<a id="twexttrunktwextwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/idirectory.py (12582 => 12583)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/idirectory.py 2014-02-06 00:17:39 UTC (rev 12582)
+++ twext/trunk/twext/who/idirectory.py 2014-02-06 00:45:30 UTC (rev 12583)
</span><span class="lines">@@ -146,8 +146,17 @@
</span><span class="cx"> """
</span><span class="cx"> Constants for common directory record field names.
</span><span class="cx">
</span><del>- Fields as associated with either a single value or an iterable of values.
</del><ins>+ Fields as associated with either a single value (the default) or an
+ iterable of values (if it has a true C{multiValue} attribute).
</ins><span class="cx">
</span><ins>+ Field values must be an instance of an expected type. The default expected
+ type for a field is L{unicode}, and may be overriden by a C{valueType}
+ attribute on the field name.
+
+ In the case where the expected type is a constant (eg. L{NamedConstant}),
+ C{valueType} should be the container that contains the constant (eg. a
+ subclass of L{Names}).
+
</ins><span class="cx"> @cvar uid: The primary unique identifier for a directory record.
</span><span class="cx"> The associated value must be a L{unicode}.
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (12582 => 12583)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py 2014-02-06 00:17:39 UTC (rev 12582)
+++ twext/trunk/twext/who/xml.py 2014-02-06 00:45:30 UTC (rev 12583)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> tostring as etreeToString, Element as XMLElement,
</span><span class="cx"> )
</span><span class="cx">
</span><del>-from twisted.python.constants import NamedConstant, Values, ValueConstant
</del><ins>+from twisted.python.constants import Names, Values, ValueConstant, Flags
</ins><span class="cx"> from twisted.internet.defer import fail
</span><span class="cx">
</span><span class="cx"> from .idirectory import (
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> .format(boolElement.value, fieldNode.tag)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- elif valueType is NamedConstant:
</del><ins>+ elif issubclass(valueType, (Names, Values, Flags)):
</ins><span class="cx"> constantElement = self._constantElement(fieldNode)
</span><span class="cx">
</span><span class="cx"> value = constantElement.constantValue
</span></span></pre>
</div>
</div>
</body>
</html>