Revision

11815

Author

gaya@apple.com

Date

2013-10-14 14:24:57 -0700 (Mon, 14 Oct 2013)

Log Message

clean for pyflakes

Modified Paths

• CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py
• CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/test/test_sql.py

Diff

--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py	2013-10-14 21:08:10 UTC (rev 11814)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py	2013-10-14 21:24:57 UTC (rev 11815)
@@ -55,7 +55,7 @@
 from txdav.common.datastore.sql_tables import _ABO_KIND_PERSON, \
     _ABO_KIND_GROUP, _ABO_KIND_RESOURCE, _ABO_KIND_LOCATION, schema, \
     _BIND_MODE_OWN, _BIND_MODE_WRITE, _BIND_STATUS_ACCEPTED, \
-    _BIND_STATUS_DECLINED, _BIND_STATUS_INVITED
+    _BIND_STATUS_DECLINED
 from txdav.common.icommondatastore import InternalDataStoreError, \
     InvalidUIDError, UIDExistsError, ObjectResourceTooBigError, \
     InvalidObjectResourceError, InvalidComponentForStoreError, \

--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/test/test_sql.py	2013-10-14 21:08:10 UTC (rev 11814)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/test/test_sql.py	2013-10-14 21:24:57 UTC (rev 11815)
@@ -598,7 +598,6 @@
             )
         subgroupObject = yield adbk.createAddressBookObjectWithName("sg.vcf", subgroup)
 
-        memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID, aboMembers.REMOVED, aboMembers.REVISION], From=aboMembers).on(txn)
         memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID], From=aboMembers, Where=aboMembers.REMOVED == False).on(txn)
         self.assertEqual(sorted(memberRows), sorted([
                                                      [groupObject._resourceID, subgroupObject._resourceID],
@@ -608,11 +607,10 @@
         foreignMemberRows = yield Select([aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers).on(txn)
         self.assertEqual(foreignMemberRows, [])
 
-        memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID, aboMembers.REMOVED, aboMembers.REVISION], From=aboMembers).on(txn)
         yield subgroupObject.remove()
         memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID, aboMembers.REMOVED, aboMembers.REVISION], From=aboMembers).on(txn)
 
-                # combine by groupID
+        # combine by groupID
         groupIDToMemberRowMap = {}
         for groupID, id, removed, version in memberRows:
             memberRow = groupIDToMemberRowMap.get(groupID, [])
@@ -621,8 +619,8 @@
 
         # see if this object is in current version
         groupIDs = set([
-            groupID for groupID, memberRows in groupIDToMemberRowMap.iteritems()
-                if AddressBook._currentMemberIDsFromMemberIDRemovedRevisionRows(memberRows)
+            groupID for groupID, memberIDRemovedRevisionRows in groupIDToMemberRowMap.iteritems()
+                if AddressBook._currentMemberIDsFromMemberIDRemovedRevisionRows(memberIDRemovedRevisionRows)
         ])
 
         self.assertEqual(len(groupIDs), 0)