<!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>[13294] 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/13294">13294</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 18:00:56 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change repr(record) to prefer <Record (recordType)shortName> as before if it can look up a shortname, otherwise go with <Record uid>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
<li><a href="#twexttrunktwextwholdaptesttest_utilpy">twext/trunk/twext/who/ldap/test/test_util.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.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 (13293 => 13294)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py 2014-04-15 22:36:02 UTC (rev 13293)
+++ twext/trunk/twext/who/directory.py 2014-04-16 01:00:56 UTC (rev 13294)
</span><span class="lines">@@ -417,13 +417,21 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __repr__(self):
</span><del>- return (
- "<{self.__class__.__name__} ({recordType}){uid}>".format(
- self=self,
- recordType=describe(self.recordType),
- uid=self.uid,
</del><ins>+ try:
+ return (
+ "<{self.__class__.__name__} ({recordType}){shortName}>".format(
+ self=self,
+ recordType=describe(self.recordType),
+ shortName=self.shortNames[0],
+ )
</ins><span class="cx"> )
</span><del>- )
</del><ins>+ except (AttributeError, IndexError):
+ return (
+ "<{self.__class__.__name__} {uid}>".format(
+ self=self,
+ uid=self.uid,
+ )
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __hash__(self):
</span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_util.py (13293 => 13294)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_util.py 2014-04-15 22:36:02 UTC (rev 13293)
+++ twext/trunk/twext/who/ldap/test/test_util.py 2014-04-16 01:00:56 UTC (rev 13294)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def service(self):
</span><del>- # Use intentionally funky conenction info, since we don't expect
</del><ins>+ # Use intentionally funky connection info, since we don't expect
</ins><span class="cx"> # to connect.
</span><span class="cx"> return DirectoryService(
</span><span class="cx"> u"ldap://cretin/", u"o=plugh",
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (13293 => 13294)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py 2014-04-15 22:36:02 UTC (rev 13293)
+++ twext/trunk/twext/who/test/test_directory.py 2014-04-16 01:00:56 UTC (rev 13294)
</span><span class="lines">@@ -295,12 +295,14 @@
</span><span class="cx"> result = yield service.recordsFromExpression("twistedmatrix.com")
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- set((
- u"__wsanchez__",
- u"__glyph__",
- u"__exarkun__",
- u"__dreid__",
- )),
</del><ins>+ set(
+ (
+ u"__wsanchez__",
+ u"__glyph__",
+ u"__exarkun__",
+ u"__dreid__",
+ )
+ ),
</ins><span class="cx"> set((record.uid for record in result))
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -324,15 +326,17 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- set((
- u"__wsanchez__",
- u"__glyph__",
- u"__sagen__",
- u"__cdaboo__",
- u"__dre__",
- u"__exarkun__",
- u"__dreid__",
- )),
</del><ins>+ set(
+ (
+ u"__wsanchez__",
+ u"__glyph__",
+ u"__sagen__",
+ u"__cdaboo__",
+ u"__dre__",
+ u"__exarkun__",
+ u"__dreid__",
+ )
+ ),
</ins><span class="cx"> set((record.uid for record in result))
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -356,10 +360,12 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- set((
- u"__wsanchez__",
- u"__glyph__",
- )),
</del><ins>+ set(
+ (
+ u"__wsanchez__",
+ u"__glyph__",
+ )
+ ),
</ins><span class="cx"> set((record.uid for record in result))
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -588,6 +594,17 @@
</span><span class="cx"> FieldName.shortNames: (u"nobody",),
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ fields_no_shortnames = {
+ FieldName.uid: u"UID:no_shortnames",
+ FieldName.recordType: RecordType.user,
+ }
+
+ fields_empty_shortnames = {
+ FieldName.uid: u"UID:empty_shortnames",
+ FieldName.recordType: RecordType.user,
+ FieldName.shortNames: (),
+ }
+
</ins><span class="cx"> fields_none_password = {
</span><span class="cx"> FieldName.uid: u"UID:nobody",
</span><span class="cx"> FieldName.recordType: RecordType.user,
</span><span class="lines">@@ -822,18 +839,42 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def test_repr(self):
</del><ins>+ def test_reprWithShortName(self):
</ins><span class="cx"> """
</span><del>- L{DirectoryRecord.repr} returns the expected string.
</del><ins>+ L{DirectoryRecord.repr} returns a string using short name.
</ins><span class="cx"> """
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- "<DirectoryRecord (user)UID:wsanchez>",
</del><ins>+ "<DirectoryRecord (user)wsanchez>",
</ins><span class="cx"> repr(wsanchez)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_reprWithoutShortName(self):
+ """
+ L{DirectoryRecord.repr} returns a string using UID.
+ """
+ wsanchez = self.makeRecord(self.fields_no_shortnames)
+
+ self.assertEquals(
+ "<DirectoryRecord UID:no_shortnames>",
+ repr(wsanchez)
+ )
+
+
+ def test_reprEmptyShortName(self):
+ """
+ L{DirectoryRecord.repr} returns a string using UID.
+ """
+ wsanchez = self.makeRecord(self.fields_empty_shortnames)
+
+ self.assertEquals(
+ "<DirectoryRecord UID:empty_shortnames>",
+ repr(wsanchez)
+ )
+
+
</ins><span class="cx"> def test_compare(self):
</span><span class="cx"> """
</span><span class="cx"> Comparison of records.
</span></span></pre>
</div>
</div>
</body>
</html>