Skip to content

Commit

Permalink
Fixed "loop over non sequence" bug in Catalog. This is from the
Browse files Browse the repository at this point in the history
Collector entries #1766.  It's based on Darin Lee's patch, but
expanded to catch some other cases.
  • Loading branch information
petrilli committed Dec 13, 2000
1 parent b497106 commit 146aab9
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Catalog.py
Expand Up @@ -547,11 +547,16 @@ def _indexedSearch(self, args, sort_index, append, used,
for k, intset in sort_index._index.items():
if type(rs) is IIBType:
intset=rs.intersection(intset)
# Since we still have an IIBucket, let's convert
# it to its set of keys
intset=intset.keys()
else:
intset=intset.intersection(rs)
if intset:
append((k,LazyMap(self.__getitem__, intset)))
else:
if type(rs) is IIBType:
rs=rs.keys()
for r in rs:
append((sort_index._unindex[r],
LazyMap(self.__getitem__,[r])))
Expand Down

0 comments on commit 146aab9

Please sign in to comment.