[Checkins] SVN: Zope3/branches/3.3/src/zope/app/cache/ Merge r77123:77124 from 3.2 branch

[Daniel Nouri]

Log message for revision 77125:
  Merge r77123:77124 from 3.2 branch
  

Changed:
  U   Zope3/branches/3.3/src/zope/app/cache/ram.py
  U   Zope3/branches/3.3/src/zope/app/cache/tests/test_ramcache.py

-=-
Modified: Zope3/branches/3.3/src/zope/app/cache/ram.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/cache/ram.py	2007-06-27 12:50:19 UTC (rev 77124)
+++ Zope3/branches/3.3/src/zope/app/cache/ram.py	2007-06-27 12:54:42 UTC (rev 77125)
@@ -299,7 +299,7 @@
             if len(keys) > self.maxEntries:
                 def getKey(item):
                     ob, key = item
-                    return data[ob][key]
+                    return data[ob][key][2]
                 keys.sort(key=getKey)
 
                 ob, key = keys[self.maxEntries]

Modified: Zope3/branches/3.3/src/zope/app/cache/tests/test_ramcache.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/cache/tests/test_ramcache.py	2007-06-27 12:50:19 UTC (rev 77124)
+++ Zope3/branches/3.3/src/zope/app/cache/tests/test_ramcache.py	2007-06-27 12:54:42 UTC (rev 77125)
@@ -460,15 +460,15 @@
         value = 'yes'
         timestamp = time()
         s._data = {object:  {key1: [value, 1, 10],
-                             key2: [value, 2, 5],
-                             key3: [value, 3, 2]},
-                   object2: {key1: [value, 4, 2],
-                             key2: [value, 5, 1],
-                             key3: [value, 6, 1]}}
+                             key2: [value, 6, 5],
+                             key3: [value, 2, 2]},
+                   object2: {key1: [value, 5, 2],
+                             key2: [value, 3, 1],
+                             key3: [value, 4, 1]}}
         s.removeLeastAccessed()
         self.assertEqual(s._data,
                          {object:  {key1: [value, 1, 0],
-                                    key2: [value, 2, 0]}},
+                                    key2: [value, 6, 0]}},
                          'least records removed incorrectly')
 
         s = Storage(maxEntries=6)