[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/fb76bb09ad0f
changeset:   75755:fb76bb09ad0f
parent:      75754:b2a8310de718
parent:      75753:13e2d09e0612
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sat Mar 17 00:24:12 2012 +0100
summary:
  Merge

files:
  Lib/functools.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/functools.py b/Lib/functools.py
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -226,9 +226,11 @@
 
         def cache_clear():
             """Clear the cache and cache statistics"""
-            nonlocal hits, misses
+            nonlocal hits, misses, root
             with lock:
                 cache.clear()
+                root = []
+                root[:] = [root, root, None, None]
                 hits = misses = 0
 
         wrapper.cache_info = cache_info

-- 
Repository URL: http://hg.python.org/cpython