[Zope-Checkins] SVN: Zope/trunk/src/App/CacheManager.py Merge c126512 from 2.13 branch

[Hano Schlichting]

Log message for revision 126513:
  Merge c126512 from 2.13 branch
  

Changed:
  U   Zope/trunk/src/App/CacheManager.py

-=-
Modified: Zope/trunk/src/App/CacheManager.py
===================================================================
--- Zope/trunk/src/App/CacheManager.py	2012-05-28 12:48:01 UTC (rev 126512)
+++ Zope/trunk/src/App/CacheManager.py	2012-05-28 12:48:52 UTC (rev 126513)
@@ -97,10 +97,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):
         """