[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - Catalog.py:1.94

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv27631

Modified Files:
	Catalog.py 
Log Message:
Fixed a bug in catalog result merging code that was never reached before:
the length of the concatenated sequence is not the same as the length of r,
since r contains sequences of different sizes.  Let LazyCat compute the
length.


=== Zope/lib/python/Products/ZCatalog/Catalog.py 1.93 => 1.94 ===
             return r[0][1]
     else:
         if not has_sort_keys:
-            return LazyCat(r, len(r))
+            # Note that the length of the final sequence is not
+            # the same as the length of r, since r may contain
+            # sequences of different sizes.
+            return LazyCat(r)
         else:
             r.sort()
             if reverse: