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

[benjamin.peterson]

http://hg.python.org/cpython/rev/13e2d09e0612
changeset:   75753:13e2d09e0612
parent:      75752:087da2a353e6
parent:      75751:8b2668e60aef
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Mar 16 18:22:53 2012 -0500
summary:
  merge heads

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


diff --git a/Lib/functools.py b/Lib/functools.py
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -156,6 +156,7 @@
         lock = Lock()                   # needed because linkedlist isn't threadsafe
         root = []                       # root of circular doubly linked list
         root[:] = [root, root, None, None]      # initialize by pointing to self
+        PREV, NEXT, KEY, RESULT = 0, 1, 2, 3    # names of link fields
 
         if maxsize is None:
             @wraps(user_function)
@@ -191,8 +192,6 @@
                     key += tuple(map(type, args))
                     if kwds:
                         key += tuple(type(v) for k, v in sorted_items)
-                PREV = 0                        # names of link fields
-                NEXT = 1
                 with lock:
                     link = cache_get(key)
                     if link is not None:

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