<!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>[12212] CalendarServer/trunk/txdav</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/12212">12212</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 10:44:12 -0800 (Thu, 02 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>pyflakes fix.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingconduitpy">CalendarServer/trunk/txdav/common/datastore/podding/conduit.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingresourcepy">CalendarServer/trunk/txdav/common/datastore/podding/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastorepoddingtesttest_conduitpy">CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (12211 => 12212)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-01-02 17:19:18 UTC (rev 12211)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-01-02 18:44:12 UTC (rev 12212)
</span><span class="lines">@@ -1395,7 +1395,7 @@
</span><span class="cx">             try:
</span><span class="cx">                 filter = Filter.deserialize(filter)
</span><span class="cx">             except Exception:
</span><del>-                file = None
</del><ins>+                filter = None
</ins><span class="cx"> 
</span><span class="cx">         # Make sure we have a proper Filter element and get the partial SQL statement to use.
</span><span class="cx">         sql_stmt = self._sqlquery(filter, useruid, fbtype)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingconduitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/conduit.py (12211 => 12212)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/conduit.py        2014-01-02 17:19:18 UTC (rev 12211)
+++ CalendarServer/trunk/txdav/common/datastore/podding/conduit.py        2014-01-02 18:44:12 UTC (rev 12212)
</span><span class="lines">@@ -27,10 +27,6 @@
</span><span class="cx"> from twistedcaldav.caldavxml import TimeRange
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-__all__ = [
-    &quot;PoddingConduitResource&quot;,
-]
-
</del><span class="cx"> log = Logger()
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/resource.py (12211 => 12212)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/resource.py        2014-01-02 17:19:18 UTC (rev 12211)
+++ CalendarServer/trunk/txdav/common/datastore/podding/resource.py        2014-01-02 18:44:12 UTC (rev 12212)
</span><span class="lines">@@ -35,10 +35,6 @@
</span><span class="cx"> import base64
</span><span class="cx"> import json
</span><span class="cx"> 
</span><del>-__all__ = [
-    &quot;ConduitResource&quot;,
-]
-
</del><span class="cx"> class ConduitResource(ReadOnlyNoCopyResourceMixIn, DAVResourceWithoutChildrenMixin, DAVResource):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Podding cross-pod RPC conduit resource.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastorepoddingtesttest_conduitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py (12211 => 12212)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py        2014-01-02 17:19:18 UTC (rev 12211)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py        2014-01-02 18:44:12 UTC (rev 12212)
</span><span class="lines">@@ -627,12 +627,12 @@
</span><span class="cx"> 
</span><span class="cx">         shared = yield self.calendarUnderTest(txn=self.newOtherTransaction(), home=&quot;puser01&quot;, name=&quot;shared-calendar&quot;)
</span><span class="cx">         resources = yield shared.objectResources()
</span><del>-        byname = dict([(resource.name(), resource) for resource in resources])
-        byuid = dict([(resource.uid(), resource) for resource in resources])
</del><ins>+        byname = dict([(obj.name(), obj) for obj in resources])
+        byuid = dict([(obj.uid(), obj) for obj in resources])
</ins><span class="cx">         self.assertEqual(len(resources), 1)
</span><del>-        self.assertEqual(set([resource.name() for resource in resources]), set((&quot;2.ics&quot;,)))
-        self.assertEqual(set([resource.uid() for resource in resources]), set((&quot;uid2&quot;,)))
-        self.assertEqual(set([resource.id() for resource in resources]), set((resource_id2,)))
</del><ins>+        self.assertEqual(set([obj.name() for obj in resources]), set((&quot;2.ics&quot;,)))
+        self.assertEqual(set([obj.uid() for obj in resources]), set((&quot;uid2&quot;,)))
+        self.assertEqual(set([obj.id() for obj in resources]), set((resource_id2,)))
</ins><span class="cx">         resource = yield shared.objectResourceWithName(&quot;1.ics&quot;)
</span><span class="cx">         self.assertTrue(resource is None)
</span><span class="cx">         resource = yield shared.objectResourceWithName(&quot;2.ics&quot;)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12211 => 12212)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2014-01-02 17:19:18 UTC (rev 12211)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2014-01-02 18:44:12 UTC (rev 12212)
</span><span class="lines">@@ -4869,8 +4869,7 @@
</span><span class="cx">             if depth == &quot;1&quot;:
</span><span class="cx">                 pass
</span><span class="cx">             else:
</span><del>-                name = self.name() + &quot;/&quot;
-                invalid.add(name)
</del><ins>+                invalid.add(self.name() + &quot;/&quot;)
</ins><span class="cx">         else:
</span><span class="cx">             if revision != 0 and revision &lt; self._bindRevision:
</span><span class="cx">                 if depth != &quot;1&quot;:
</span></span></pre>
</div>
</div>

</body>
</html>