<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[2497] CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/2497">2497</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2008-05-25 11:27:29 -0700 (Sun, 25 May 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ixnay on the eferredGeneratorsday</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_principalpy">CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py (2496 => 2497)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py        2008-05-25 18:03:14 UTC (rev 2496)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py        2008-05-25 18:27:29 UTC (rev 2497)
</span><span class="lines">@@ -16,8 +16,7 @@
</span><span class="cx"> 
</span><span class="cx"> import os
</span><span class="cx"> 
</span><del>-from twisted.internet.defer import deferredGenerator
-from twisted.internet.defer import waitForDeferred
</del><ins>+from twisted.internet.defer import inlineCallbacks
</ins><span class="cx"> from twisted.web2.dav import davxml
</span><span class="cx"> from twisted.web2.dav.fileop import rmdir
</span><span class="cx"> from twisted.web2.dav.resource import AccessDeniedError
</span><span class="lines">@@ -239,26 +238,22 @@
</span><span class="cx">         for provisioningResource, recordType, recordResource, record in self._allRecords():
</span><span class="cx">             self.failUnless(recordResource.displayName())
</span><span class="cx"> 
</span><del>-    @deferredGenerator
</del><ins>+    @inlineCallbacks
</ins><span class="cx">     def test_groupMembers(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         DirectoryPrincipalResource.groupMembers()
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         for provisioningResource, recordType, recordResource, record in self._allRecords():
</span><del>-            d = waitForDeferred(recordResource.groupMembers())
-            yield d
-            members = d.getResult()
</del><ins>+            members = yield recordResource.groupMembers()
</ins><span class="cx">             self.failUnless(set(record.members()).issubset(set(r.record for r in members)))
</span><span class="cx"> 
</span><del>-    @deferredGenerator
</del><ins>+    @inlineCallbacks
</ins><span class="cx">     def test_groupMemberships(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         DirectoryPrincipalResource.groupMemberships()
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         for provisioningResource, recordType, recordResource, record in self._allRecords():
</span><del>-            d = waitForDeferred(recordResource.groupMemberships())
-            yield d
-            memberships = d.getResult()
</del><ins>+            memberships = yield recordResource.groupMemberships()
</ins><span class="cx">             self.failUnless(set(record.groups()).issubset(set(r.record for r in memberships if hasattr(r, &quot;record&quot;))))
</span><span class="cx"> 
</span><span class="cx">     def test_proxies(self):
</span></span></pre>
</div>
</div>

</body>
</html>