languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 00:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync-up minor code edits with the default branch.

Browse source
This commit is contained in:
Raymond Hettinger 2011-05-05 14:15:12 -07:00
parent 102d874999
commit 8cd2e5f751
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Lib/functools.py
View file

@ -97,7 +97,7 @@ def cmp_to_key(mycmp):
"""Convert a cmp= function into a key= function"""
class K(object):
__slots__ = ['obj']
def __init__(self, obj, *args):
def __init__(self, obj):
self.obj = obj
def __lt__(self, other):
return mycmp(self.obj, other.obj) < 0
@ -140,7 +140,7 @@ def decorating_function(user_function,
tuple=tuple, sorted=sorted, len=len, KeyError=KeyError):
hits = misses = 0
kwd_mark = object() # separates positional and keyword args
kwd_mark = (object(),) # separates positional and keyword args
lock = Lock() # needed because ordereddicts aren't threadsafe
if maxsize is None:
@ -151,7 +151,7 @@ def wrapper(*args, **kwds):
nonlocal hits, misses
key = args
if kwds:
key += (kwd_mark,) + tuple(sorted(kwds.items()))
key += kwd_mark + tuple(sorted(kwds.items()))
try:
result = cache[key]
hits += 1
@ -170,7 +170,7 @@ def wrapper(*args, **kwds):
nonlocal hits, misses
key = args
if kwds:
key += (kwd_mark,) + tuple(sorted(kwds.items()))
key += kwd_mark + tuple(sorted(kwds.items()))
try:
with lock:
result = cache[key]