class Index(object): # # OK, here's where we get ugly. # The index code needs to be rewritten also, but in the meantime... # def __init__(self, addressbook): self.addressbook = addressbook stubResource = AddressBookStubResource(addressbook) self._oldIndex = OldIndex(stubResource) def addressbookObjects(self): addressbook = self.addressbook for name, uid, componentType in self._oldIndex.bruteForceSearch(): addressbookObject = addressbook.addressbookObjectWithName(name) # Precache what we found in the index addressbookObject._uid = uid addressbookObject._componentType = componentType yield addressbookObject