<!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>[12859] CalendarServer/branches/users/sagen/move2who</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/12859">12859</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 17:53:15 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle (some of the) AttributeErrors on emailAddresses</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2whocalendarservertoolsprincipalspy">CalendarServer/branches/users/sagen/move2who/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocalendarservertoolsshelldirectorypy">CalendarServer/branches/users/sagen/move2who/calendarserver/tools/shell/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whotxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/branches/users/sagen/move2who/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2whocalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/calendarserver/tools/principals.py (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/calendarserver/tools/principals.py 2014-03-08 01:31:09 UTC (rev 12858)
+++ CalendarServer/branches/users/sagen/move2who/calendarserver/tools/principals.py 2014-03-08 01:53:15 UTC (rev 12859)
</span><span class="lines">@@ -427,18 +427,31 @@
</span><span class="cx"> records = list((yield directory.recordsMatchingTokens(searchTerm.strip().split())))
</span><span class="cx"> if records:
</span><span class="cx"> records.sort(key=operator.attrgetter('fullNames'))
</span><del>- print("%d matches found:" % (len(records),))
</del><ins>+ print("{n} matches found:".format(n=len(records)))
</ins><span class="cx"> for record in records:
</span><span class="cx"> print(
</span><del>- "\n{d} {rt}".format(
</del><ins>+ "\n{d} ({rt})".format(
</ins><span class="cx"> d=record.displayName,
</span><span class="cx"> rt=record.recordType.name
</span><span class="cx"> )
</span><span class="cx"> )
</span><del>- print(" UID: %s" % (record.uid,))
- print(" Record name(s): %s" % (", ".join(record.shortNames),))
- if record.emailAddresses:
- print(" Email(s): %s" % (", ".join(record.emailAddresses),))
</del><ins>+ print(" UID: {u}".format(u=record.uid,))
+ print(
+ " Record name{plural}: {names}".format(
+ plural=("s" if len(record.shortNames) > 1 else ""),
+ names=(", ".join(record.shortNames))
+ )
+ )
+ try:
+ if record.emailAddresses:
+ print(
+ " Email{plural}: {emails}".format(
+ plural=("s" if len(record.emailAddresses) > 1 else ""),
+ emails=(", ".join(record.emailAddresses))
+ )
+ )
+ except AttributeError:
+ pass
</ins><span class="cx"> else:
</span><span class="cx"> print("No matches found")
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocalendarservertoolsshelldirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/calendarserver/tools/shell/directory.py (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/calendarserver/tools/shell/directory.py 2014-03-08 01:31:09 UTC (rev 12858)
+++ CalendarServer/branches/users/sagen/move2who/calendarserver/tools/shell/directory.py 2014-03-08 01:53:15 UTC (rev 12859)
</span><span class="lines">@@ -83,11 +83,17 @@
</span><span class="cx"> add("First Name", record.firstName)
</span><span class="cx"> add("Last Name" , record.lastName )
</span><span class="cx">
</span><del>- for email in record.emailAddresses:
- add("Email Address", email)
</del><ins>+ try:
+ for email in record.emailAddresses:
+ add("Email Address", email)
+ except AttributeError:
+ pass
</ins><span class="cx">
</span><del>- for cua in record.calendarUserAddresses:
- add("Calendar User Address", cua)
</del><ins>+ try:
+ for cua in record.calendarUserAddresses:
+ add("Calendar User Address", cua)
+ except AttributeError:
+ pass
</ins><span class="cx">
</span><span class="cx"> add("Server ID" , record.serverID)
</span><span class="cx"> add("Enabled" , record.enabled)
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whotxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/txdav/caldav/datastore/scheduling/imip/inbound.py (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-03-08 01:31:09 UTC (rev 12858)
+++ CalendarServer/branches/users/sagen/move2who/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-03-08 01:53:15 UTC (rev 12859)
</span><span class="lines">@@ -330,8 +330,11 @@
</span><span class="cx"> elif organizer.startswith("urn:uuid:"):
</span><span class="cx"> guid = organizer[9:]
</span><span class="cx"> record = yield self.directory.recordWithGUID(guid)
</span><del>- if record and record.emailAddresses:
- toAddr = list(record.emailAddresses)[0]
</del><ins>+ try:
+ if record and record.emailAddresses:
+ toAddr = list(record.emailAddresses)[0]
+ except AttributeError:
+ pass
</ins><span class="cx">
</span><span class="cx"> if toAddr is None:
</span><span class="cx"> log.error("Don't have an email address for the organizer; "
</span></span></pre>
</div>
</div>
</body>
</html>