[CalendarServer-changes] [12212] CalendarServer/trunk/txdav

[source_changes at macosforge.org]

Revision: 12212
          http://trac.calendarserver.org//changeset/12212
Author:   cdaboo at apple.com
Date:     2014-01-02 10:44:12 -0800 (Thu, 02 Jan 2014)
Log Message:
-----------
pyflakes fix.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/common/datastore/podding/conduit.py
    CalendarServer/trunk/txdav/common/datastore/podding/resource.py
    CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- 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)
@@ -1395,7 +1395,7 @@
             try:
                 filter = Filter.deserialize(filter)
             except Exception:
-                file = None
+                filter = None
 
         # Make sure we have a proper Filter element and get the partial SQL statement to use.
         sql_stmt = self._sqlquery(filter, useruid, fbtype)

Modified: CalendarServer/trunk/txdav/common/datastore/podding/conduit.py
===================================================================
--- 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)
@@ -27,10 +27,6 @@
 from twistedcaldav.caldavxml import TimeRange
 
 
-__all__ = [
-    "PoddingConduitResource",
-]
-
 log = Logger()
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/podding/resource.py
===================================================================
--- 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)
@@ -35,10 +35,6 @@
 import base64
 import json
 
-__all__ = [
-    "ConduitResource",
-]
-
 class ConduitResource(ReadOnlyNoCopyResourceMixIn, DAVResourceWithoutChildrenMixin, DAVResource):
     """
     Podding cross-pod RPC conduit resource.

Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py
===================================================================
--- 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)
@@ -627,12 +627,12 @@
 
         shared = yield self.calendarUnderTest(txn=self.newOtherTransaction(), home="puser01", name="shared-calendar")
         resources = yield shared.objectResources()
-        byname = dict([(resource.name(), resource) for resource in resources])
-        byuid = dict([(resource.uid(), resource) for resource in resources])
+        byname = dict([(obj.name(), obj) for obj in resources])
+        byuid = dict([(obj.uid(), obj) for obj in resources])
         self.assertEqual(len(resources), 1)
-        self.assertEqual(set([resource.name() for resource in resources]), set(("2.ics",)))
-        self.assertEqual(set([resource.uid() for resource in resources]), set(("uid2",)))
-        self.assertEqual(set([resource.id() for resource in resources]), set((resource_id2,)))
+        self.assertEqual(set([obj.name() for obj in resources]), set(("2.ics",)))
+        self.assertEqual(set([obj.uid() for obj in resources]), set(("uid2",)))
+        self.assertEqual(set([obj.id() for obj in resources]), set((resource_id2,)))
         resource = yield shared.objectResourceWithName("1.ics")
         self.assertTrue(resource is None)
         resource = yield shared.objectResourceWithName("2.ics")

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- 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)
@@ -4869,8 +4869,7 @@
             if depth == "1":
                 pass
             else:
-                name = self.name() + "/"
-                invalid.add(name)
+                invalid.add(self.name() + "/")
         else:
             if revision != 0 and revision < self._bindRevision:
                 if depth != "1":
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/c26e1ca2/attachment.html>