<!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>[12157] 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/12157">12157</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 15:32:17 -0800 (Thu, 19 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ensure that fields are of the correct type.</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="#twexttrunktwextwhoindexpy">twext/trunk/twext/who/index.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_indexpy">twext/trunk/twext/who/test/test_index.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 (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/directory.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">     fieldName = FieldName
</span><span class="cx"> 
</span><span class="cx">     normalizedFields = {
</span><del>-        FieldName.emailAddresses: lambda e: bytes(e).lower(),
</del><ins>+        FieldName.emailAddresses: lambda e: e.lower(),
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">             if fieldName not in fields or not fields[fieldName]:
</span><span class="cx">                 raise ValueError(&quot;{0} field is required.&quot;.format(fieldName))
</span><span class="cx"> 
</span><del>-            if FieldName.isMultiValue(fieldName):
</del><ins>+            if service.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                 values = fields[fieldName]
</span><span class="cx">                 for value in values:
</span><span class="cx">                     if not value:
</span><span class="lines">@@ -308,22 +308,37 @@
</span><span class="cx">                 )
</span><span class="cx">             )
</span><span class="cx"> 
</span><ins>+        def checkType(name, value):
+            expectedType = service.fieldName.valueType(name)
+            if not isinstance(value, expectedType):
+                raise TypeError(
+                    &quot;Value {0!r} for field {1} is not of type {2}&quot;
+                    .format(value, name, expectedType)
+                )
+
</ins><span class="cx">         # Normalize fields
</span><span class="cx">         normalizedFields = {}
</span><span class="cx">         for name, value in fields.items():
</span><span class="cx">             normalize = service.normalizedFields.get(name, None)
</span><span class="cx"> 
</span><span class="cx">             if normalize is None:
</span><del>-                normalizedFields[name] = value
-                continue
</del><ins>+                normalizedValue = value
+            else:
+                if service.fieldName.isMultiValue(name):
+                    normalizedValue = tuple((normalize(v) for v in value))
+                else:
+                    normalizedValue = normalize(value)
</ins><span class="cx"> 
</span><del>-            if FieldName.isMultiValue(name):
-                normalizedFields[name] = tuple((normalize(v) for v in value))
</del><ins>+            if service.fieldName.isMultiValue(name):
+                for v in normalizedValue:
+                    checkType(name, v)
</ins><span class="cx">             else:
</span><del>-                normalizedFields[name] = normalize(value)
</del><ins>+                checkType(name, normalizedValue)
</ins><span class="cx"> 
</span><ins>+            normalizedFields[name] = normalizedValue
+
</ins><span class="cx">         self.service = service
</span><del>-        self.fields  = normalizedFields
</del><ins>+        self.fields = normalizedFields
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def __repr__(self):
</span></span></pre></div>
<a id="twexttrunktwextwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/idirectory.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/idirectory.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/idirectory.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> 
</span><span class="cx">     recordType = NamedConstant()
</span><span class="cx">     recordType.description = u&quot;record type&quot;
</span><ins>+    recordType.valueType = NamedConstant
</ins><span class="cx"> 
</span><span class="cx">     shortNames = NamedConstant()
</span><span class="cx">     shortNames.description = u&quot;short names&quot;
</span></span></pre></div>
<a id="twexttrunktwextwhoindexpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/index.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/index.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/index.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">                 values = record.fields.get(fieldName, None)
</span><span class="cx"> 
</span><span class="cx">                 if values is not None:
</span><del>-                    if not BaseFieldName.isMultiValue(fieldName):
</del><ins>+                    if not self.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                         values = (values,)
</span><span class="cx"> 
</span><span class="cx">                     for value in values:
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/opendirectory/_service.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx">             else:
</span><span class="cx">                 values = [unicode(v) for v in values]
</span><span class="cx"> 
</span><del>-            if BaseFieldName.isMultiValue(fieldName):
</del><ins>+            if service.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                 fields[fieldName] = values
</span><span class="cx">             else:
</span><span class="cx">                 assert len(values) == 1
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/test/test_directory.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -702,6 +702,31 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def test_initWithIncorrectFieldTypes(self):
+        &quot;&quot;&quot;
+        Raise L{TypeError} if fields are of the wrong type.
+        &quot;&quot;&quot;
+        self.assertRaises(
+            TypeError,
+            self.makeRecord,
+            {
+                FieldName.uid: &quot;UID:wsanchez&quot;,  # Not unicode.
+                FieldName.recordType: RecordType.user,
+                FieldName.shortNames: (u&quot;wsanchez&quot;,),
+            }
+        )
+
+        self.assertRaises(
+            TypeError,
+            self.makeRecord,
+            {
+                FieldName.uid: u&quot;UID:wsanchez&quot;,
+                FieldName.recordType: RecordType.user,
+                FieldName.shortNames: (&quot;wsanchez&quot;,),  # Not unicode.
+            }
+        )
+
+
</ins><span class="cx">     def test_repr(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         L{DirectoryRecord.repr} returns the expected string.
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_index.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_index.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/test/test_index.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">                 if values is None:
</span><span class="cx">                     continue
</span><span class="cx"> 
</span><del>-                if not BaseFieldName.isMultiValue(fieldName):
</del><ins>+                if not service.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                     values = (values,)
</span><span class="cx"> 
</span><span class="cx">                 for value in values:
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">                     self.assertIn(fieldName, record.fields)
</span><span class="cx">                     values = record.fields[fieldName]
</span><span class="cx"> 
</span><del>-                    if not BaseFieldName.isMultiValue(fieldName):
</del><ins>+                    if not service.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                         values = (values,)
</span><span class="cx"> 
</span><span class="cx">                     self.assertIn(fieldValue, values)
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (12156 => 12157)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py        2013-12-19 22:56:15 UTC (rev 12156)
+++ twext/trunk/twext/who/xml.py        2013-12-19 23:32:17 UTC (rev 12157)
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx">                     vType, fieldName
</span><span class="cx">                 )
</span><span class="cx"> 
</span><del>-            if BaseFieldName.isMultiValue(fieldName):
</del><ins>+            if self.fieldName.isMultiValue(fieldName):
</ins><span class="cx">                 values = fields.setdefault(fieldName, [])
</span><span class="cx">                 values.append(value)
</span><span class="cx">             else:
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx">                     if name in fieldNames:
</span><span class="cx">                         tag = fieldNames[name]
</span><span class="cx"> 
</span><del>-                        if BaseFieldName.isMultiValue(name):
</del><ins>+                        if self.fieldName.isMultiValue(name):
</ins><span class="cx">                             values = value
</span><span class="cx">                         else:
</span><span class="cx">                             values = (value,)
</span></span></pre>
</div>
</div>

</body>
</html>