Skip to content

Commit

Permalink
bpo-38565: add new cache_parameters method for lru_cache (GH-16916)
Browse files Browse the repository at this point in the history
  • Loading branch information
Zheaoli authored and rhettinger committed Nov 12, 2019
1 parent 98480ce commit 051ff52
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Doc/library/functools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ The :mod:`functools` module defines the following functions:
cached separately. For example, ``f(3)`` and ``f(3.0)`` will be treated
as distinct calls with distinct results.

The wrapped function is instrumented with a :func:`cache_parameters`
function that returns a new :class:`dict` showing the values for *maxsize*
and *typed*. This is for information purposes only. Mutating the values
has no effect.

To help measure the effectiveness of the cache and tune the *maxsize*
parameter, the wrapped function is instrumented with a :func:`cache_info`
function that returns a :term:`named tuple` showing *hits*, *misses*,
Expand Down Expand Up @@ -178,6 +183,9 @@ The :mod:`functools` module defines the following functions:
.. versionchanged:: 3.8
Added the *user_function* option.

.. versionadded:: 3.9
Added the function :func:`cache_parameters`

.. decorator:: total_ordering

Given a class defining one or more rich comparison ordering methods, this
Expand Down
2 changes: 2 additions & 0 deletions Lib/functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,15 @@ def lru_cache(maxsize=128, typed=False):
# The user_function was passed in directly via the maxsize argument
user_function, maxsize = maxsize, 128
wrapper = _lru_cache_wrapper(user_function, maxsize, typed, _CacheInfo)
wrapper.cache_parameters = lambda : {'maxsize': maxsize, 'typed': typed}
return update_wrapper(wrapper, user_function)
elif maxsize is not None:
raise TypeError(
'Expected first argument to be an integer, a callable, or None')

def decorating_function(user_function):
wrapper = _lru_cache_wrapper(user_function, maxsize, typed, _CacheInfo)
wrapper.cache_parameters = lambda : {'maxsize': maxsize, 'typed': typed}
return update_wrapper(wrapper, user_function)

return decorating_function
Expand Down
11 changes: 11 additions & 0 deletions Lib/test/test_functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,17 @@ def orig(x, y):
f_copy = copy.deepcopy(f)
self.assertIs(f_copy, f)

def test_lru_cache_parameters(self):
@self.module.lru_cache(maxsize=2)
def f():
return 1
self.assertEqual(f.cache_parameters(), {'maxsize': 2, "typed": False})

@self.module.lru_cache(maxsize=1000, typed=True)
def f():
return 1
self.assertEqual(f.cache_parameters(), {'maxsize': 1000, "typed": True})


@py_functools.lru_cache()
def py_cached_func(x, y):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add new cache_parameters() method for functools.lru_cache() to better support pickling.

0 comments on commit 051ff52

Please sign in to comment.