diff -r 10b965d59b49 Lib/functools.py --- a/Lib/functools.py Thu Oct 22 20:19:14 2015 +0300 +++ b/Lib/functools.py Fri Oct 23 12:48:55 2015 +0300 @@ -536,7 +536,7 @@ def _lru_cache_wrapper(user_function, ma wrapper.cache_info = cache_info wrapper.cache_clear = cache_clear - return update_wrapper(wrapper, user_function) + return wrapper try: from _functools import _lru_cache_wrapper diff -r 10b965d59b49 Lib/test/test_functools.py --- a/Lib/test/test_functools.py Thu Oct 22 20:19:14 2015 +0300 +++ b/Lib/test/test_functools.py Fri Oct 23 12:48:55 2015 +0300 @@ -1,5 +1,6 @@ import abc import collections +import copy from itertools import permutations import pickle from random import choice @@ -1251,11 +1252,64 @@ class TestLRU: self.assertEqual(b.f.cache_info(), X.f.cache_info()) self.assertEqual(c.f.cache_info(), X.f.cache_info()) -class TestLRUC(TestLRU, unittest.TestCase): - module = c_functools + def test_pickle(self): + cls = self.__class__ + for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(proto=proto, func=f): + f_copy = pickle.loads(pickle.dumps(f, proto)) + self.assertIs(f_copy, f) + + def test_copy(self): + cls = self.__class__ + for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + with self.subTest(func=f): + f_copy = copy.copy(f) + self.assertIs(f_copy, f) + + def test_deepcopy(self): + cls = self.__class__ + for f in cls.cached_func[0], cls.cached_meth, cls.cached_staticmeth: + with self.subTest(func=f): + f_copy = copy.deepcopy(f) + self.assertIs(f_copy, f) + + +@py_functools.lru_cache() +def py_cached_func(x, y): + return 3 * x + y + +@c_functools.lru_cache() +def c_cached_func(x, y): + return 3 * x + y + class TestLRUPy(TestLRU, unittest.TestCase): module = py_functools + cached_func = py_cached_func, + + @module.lru_cache() + def cached_meth(self, x, y): + return 3 * x + y + + @staticmethod + @module.lru_cache() + def cached_staticmeth(x, y): + return 3 * x + y + + +class TestLRUC(TestLRU, unittest.TestCase): + module = c_functools + cached_func = c_cached_func, + + @module.lru_cache() + def cached_meth(self, x, y): + return 3 * x + y + + @staticmethod + @module.lru_cache() + def cached_staticmeth(x, y): + return 3 * x + y class TestSingleDispatch(unittest.TestCase): diff -r 10b965d59b49 Modules/_functoolsmodule.c --- a/Modules/_functoolsmodule.c Thu Oct 22 20:19:14 2015 +0300 +++ b/Modules/_functoolsmodule.c Fri Oct 23 12:48:55 2015 +0300 @@ -1047,6 +1047,12 @@ lru_cache_cache_clear(lru_cache_object * Py_RETURN_NONE; } +static PyObject * +lru_cache_reduce(PyObject *self, PyObject *unused) +{ + return PyObject_GetAttrString(self, "__qualname__"); +} + static int lru_cache_tp_traverse(lru_cache_object *self, visitproc visit, void *arg) { @@ -1097,6 +1103,7 @@ cache_info_type: namedtuple class wit static PyMethodDef lru_cache_methods[] = { {"cache_info", (PyCFunction)lru_cache_cache_info, METH_NOARGS}, {"cache_clear", (PyCFunction)lru_cache_cache_clear, METH_NOARGS}, + {"__reduce__", (PyCFunction)lru_cache_reduce, METH_NOARGS}, {NULL} };