[CalendarServer-changes] [14527] CalendarServer/trunk/txdav/common/datastore

[source_changes at macosforge.org]

Revision: 14527
          http://trac.calendarserver.org//changeset/14527
Author:   cdaboo at apple.com
Date:     2015-03-07 09:13:26 -0800 (Sat, 07 Mar 2015)
Log Message:
-----------
pyflakes.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/podding/directory.py
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/common/datastore/podding/directory.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/podding/directory.py	2015-03-07 05:42:58 UTC (rev 14526)
+++ CalendarServer/trunk/txdav/common/datastore/podding/directory.py	2015-03-07 17:13:26 UTC (rev 14527)
@@ -272,7 +272,7 @@
 
         results = yield txn.dumpGroupDelegatesLocal(delegator.uid)
 
-        returnValue([[delegator.serialize(), group.serialize()] for delegator, group in results])
+        returnValue([[delegator_record.serialize(), group_record.serialize()] for delegator_record, group_record in results])
 
 
     @inlineCallbacks

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2015-03-07 05:42:58 UTC (rev 14526)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2015-03-07 17:13:26 UTC (rev 14527)
@@ -1857,7 +1857,7 @@
 
             if len(results) > 1:
                 # Pick the best one in order: normal, disabled and external
-                byStatus = dict([(result[cls.homeColumns().index(cls._homeSchema.STATUS)], result) for result in results])
+                byStatus = dict([(item[cls.homeColumns().index(cls._homeSchema.STATUS)], item) for item in results])
                 result = byStatus.get(_HOME_STATUS_NORMAL)
                 if result is None:
                     result = byStatus.get(_HOME_STATUS_DISABLED)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150307/df21447b/attachment.html>