[Zope-Checkins] SVN: Zope/branches/2.13/ LP #838978: Fixed TypeError in cache_detail ZMI view.

[Hano Schlichting]

Log message for revision 126512:
  LP #838978: Fixed TypeError in cache_detail ZMI view.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/App/CacheManager.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2012-05-28 12:24:03 UTC (rev 126511)
+++ Zope/branches/2.13/doc/CHANGES.rst	2012-05-28 12:48:01 UTC (rev 126512)
@@ -8,6 +8,8 @@
 2.13.14 (unreleased)
 --------------------
 
+- LP #838978: Fixed TypeError in cache_detail ZMI view.
+
 - Cleanup lock and pid files if the process dies early in startup.
 
 - Added PubStart, PubBeforeCommit and PubAfterTraversal events to the

Modified: Zope/branches/2.13/src/App/CacheManager.py
===================================================================
--- Zope/branches/2.13/src/App/CacheManager.py	2012-05-28 12:24:03 UTC (rev 126511)
+++ Zope/branches/2.13/src/App/CacheManager.py	2012-05-28 12:48:01 UTC (rev 126512)
@@ -102,10 +102,10 @@
         if REQUEST is not None:
             # format as text
             REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain')
-            return '\n'.join('%6d %s'%(count, name) for count, name in detail)
-        else:
-            # raw
-            return detail
+            return '\n'.join(
+                ['%6d %s' % (count, name) for name, count in detail])
+        # raw
+        return detail
 
     def cache_extreme_detail(self, REQUEST=None):
         """