[Checkins] SVN: Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py Actually make the plan output sane

[Hanno Schlichting]

Log message for revision 123122:
  Actually make the plan output sane
  

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

-=-
Modified: Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-10-20 14:26:58 UTC (rev 123121)
+++ Products.ZCatalog/trunk/src/Products/ZCatalog/ZCatalog.py	2011-10-20 14:34:13 UTC (rev 123122)
@@ -49,7 +49,6 @@
 from Products.ZCatalog.ProgressHandler import ZLogHandler
 from Products.ZCatalog.ZCatalogIndexes import ZCatalogIndexes
 from .plan import PriorityMap
-from .plan import VALUE_INDEX_KEY
 
 LOG = logging.getLogger('Zope.ZCatalog')
 
@@ -900,16 +899,15 @@
         for cid, plan in sorted(pmap.items()):
             output.append('  %s: {' % repr(cid))
             for querykey, details in sorted(plan.items()):
-                output.append('    %s: {' % repr(querykey))
                 if isinstance(details, (frozenset, set)):
-                    output.append('      %r:\n      %r,' % (
-                        VALUE_INDEX_KEY, details))
+                    output.append('    %r: %r,' % (querykey, details))
                 else:
+                    output.append('    %s: {' % repr(querykey))
                     for indexname, bench in sorted(details.items()):
                         tuplebench = (round(bench[0], 4), ) + bench[1:]
                         output.append('      %r:\n      %r,' % (
                             indexname, tuplebench))
-                output.append('    },')
+                    output.append('    },')
             output.append('  },')
         output.append('}')
         return '\n'.join(output)