[CalendarServer-changes] [12240] CalendarServer/trunk/txdav/common/datastore/podding/test/ test_conduit.py

[source_changes at macosforge.org]

Revision: 12240
          http://trac.calendarserver.org//changeset/12240
Author:   cdaboo at apple.com
Date:     2014-01-06 13:15:27 -0800 (Mon, 06 Jan 2014)
Log Message:
-----------
pyflakes fix.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py

Modified: CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py	2014-01-04 01:04:39 UTC (rev 12239)
+++ CalendarServer/trunk/txdav/common/datastore/podding/test/test_conduit.py	2014-01-06 21:15:27 UTC (rev 12240)
@@ -594,12 +594,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), 2)
-        self.assertEqual(set([resource.name() for resource in resources]), set(("1.ics", "2.ics",)))
-        self.assertEqual(set([resource.uid() for resource in resources]), set(("uid1", "uid2",)))
-        self.assertEqual(set([resource.id() for resource in resources]), set((resource_id1, resource_id2,)))
+        self.assertEqual(set([obj.name() for obj in resources]), set(("1.ics", "2.ics",)))
+        self.assertEqual(set([obj.uid() for obj in resources]), set(("uid1", "uid2",)))
+        self.assertEqual(set([obj.id() for obj in resources]), set((resource_id1, resource_id2,)))
         resource = yield shared.objectResourceWithName("1.ics")
         self.assertTrue(resource is byname["1.ics"])
         resource = yield shared.objectResourceWithName("2.ics")
@@ -677,12 +677,12 @@
 
         shared = yield self.calendarUnderTest(txn=self.newOtherTransaction(), home="puser01", name="shared-calendar")
         resources = yield shared.objectResourcesWithNames(("1.ics", "3.ics",))
-        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), 2)
-        self.assertEqual(set([resource.name() for resource in resources]), set(("1.ics", "3.ics",)))
-        self.assertEqual(set([resource.uid() for resource in resources]), set(("uid1", "uid3",)))
-        self.assertEqual(set([resource.id() for resource in resources]), set((resource_id1, resource_id3,)))
+        self.assertEqual(set([obj.name() for obj in resources]), set(("1.ics", "3.ics",)))
+        self.assertEqual(set([obj.uid() for obj in resources]), set(("uid1", "uid3",)))
+        self.assertEqual(set([obj.id() for obj in resources]), set((resource_id1, resource_id3,)))
         resource = yield shared.objectResourceWithName("1.ics")
         self.assertTrue(resource is byname["1.ics"])
         resource = yield shared.objectResourceWithName("3.ics")
@@ -710,12 +710,12 @@
 
         shared = yield self.calendarUnderTest(txn=self.newOtherTransaction(), home="puser01", name="shared-calendar")
         resources = yield shared.objectResourcesWithNames(("1.ics", "3.ics",))
-        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(("3.ics",)))
-        self.assertEqual(set([resource.uid() for resource in resources]), set(("uid3",)))
-        self.assertEqual(set([resource.id() for resource in resources]), set((resource_id3,)))
+        self.assertEqual(set([obj.name() for obj in resources]), set(("3.ics",)))
+        self.assertEqual(set([obj.uid() for obj in resources]), set(("uid3",)))
+        self.assertEqual(set([obj.id() for obj in resources]), set((resource_id3,)))
         resource = yield shared.objectResourceWithName("1.ics")
         self.assertTrue(resource is None)
         resource = yield shared.objectResourceWithName("3.ics")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/0945bf8c/attachment.html>