Merge pull request #42 from zopefoundation/fix_sort_iterate_resultset

fix sorting in _sort_iterate_resultset in py3
zopefoundation · Sep 24, 2018 · ec78801 · ec78801
2 parents f945eb9 + 0fb158b
commit ec78801
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,8 @@ Changelog
 - Adapt the ZMI HTML to the new Bootstrap ZMI.
   (`#41 <https://github.com/zopefoundation/Products.ZCatalog/pull/41>`_)
 
+- Fix sorting in _sort_iterate_resultset in python 3.
+  (`#42 <https://github.com/zopefoundation/Products.ZCatalog/pull/42>`_)
 
 4.1.1 (2018-07-05)
 ------------------

diff --git a/src/Products/ZCatalog/Catalog.py b/src/Products/ZCatalog/Catalog.py
@@ -791,7 +791,10 @@ def _sort_iterate_resultset(self, actual_result_count, result, rs,
                     # the cost of instantiating a LazyMap per result
                     result.append((key, did, self.__getitem__))
             if merge:
-                result.sort(reverse=reverse)
+                result = sorted(
+                    result,
+                    key=lambda x: (0,) if x[0] is None else x,
+                    reverse=reverse)
         else:
             for did in rs:
                 try: