[Checkins] SVN: Products.ZCatalog/trunk/src/Products/ZCatalog/Catalog.py Stick with getitem/except KeyError approach for sort indexes

[Hano Schlichting]

Log message for revision 125091:
  Stick with getitem/except KeyError approach for sort indexes
  

Changed:
  U   Products.ZCatalog/trunk/src/Products/ZCatalog/Catalog.py

-=-
Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/Catalog.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/Catalog.py	2012-04-07 20:13:56 UTC (rev 125090)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/Catalog.py	2012-04-07 20:32:56 UTC (rev 125091)
@@ -769,7 +769,10 @@
                         # sort on secondary index
                         keysets = defaultdict(list)
                         for i in intset:
-                            keysets[(k, index2_key_map.get(i))].append(i)
+                            try:
+                                keysets[(k, index2_key_map[i])].append(i)
+                            except KeyError:
+                                pass
                         for k2, v2 in keysets.items():
                             append((k2, v2, _self__getitem__))
                 result = multisort(result, sort_spec)