diff options
| author | Raymond Hettinger <python@rcn.com> | 2014-08-12 19:45:28 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2014-08-12 19:45:28 (GMT) |
| commit | 92c7b90148fafff423b56950d3f0a9267e7a95ad (patch) | |
| tree | 948cfd567b4447d9510e5c1c6e9c85f218a6ce17 | |
| parent | 574d4cfdf61b35e1c3a616a6b61b4707d5ba41e5 (diff) | |
| parent | 4d58897fdb0f123340246fac79174a52d7cbcf85 (diff) | |
| download | cpython-92c7b90148fafff423b56950d3f0a9267e7a95ad.zip cpython-92c7b90148fafff423b56950d3f0a9267e7a95ad.tar.gz cpython-92c7b90148fafff423b56950d3f0a9267e7a95ad.tar.bz2 | |
merge
| -rw-r--r-- | Lib/functools.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_functools.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Lib/functools.py b/Lib/functools.py index 4538057..c1ca850 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -392,6 +392,12 @@ def lru_cache(maxsize=128, typed=False): # The internals of the lru_cache are encapsulated for thread safety and # to allow the implementation to change (including a possible C version). + # Early detection of an erroneous call to @lru_cache without any arguments + # resulting in the inner function being passed to maxsize instead of an + # integer or None. + if maxsize is not None and not isinstance(maxsize, int): + raise TypeError('Expected maxsize to be an integer or None') + # Constants shared by all lru cache instances: sentinel = object() # unique object used to signal cache misses make_key = _make_key # build a key from the function arguments diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py index 75ae7f3..a7e5c7e 100644 --- a/Lib/test/test_functools.py +++ b/Lib/test/test_functools.py @@ -1070,6 +1070,13 @@ class TestLRU(unittest.TestCase): self.assertEqual(test_func(DoubleEq(2)), # Trigger a re-entrant __eq__ call DoubleEq(2)) # Verify the correct return value + def test_early_detection_of_bad_call(self): + # Issue #22184 + with self.assertRaises(TypeError): + @functools.lru_cache + def f(): + pass + class TestSingleDispatch(unittest.TestCase): def test_simple_overloads(self): @@ -118,6 +118,9 @@ Library - Issue #21448: Changed FeedParser feed() to avoid O(N**2) behavior when parsing long line. Original patch by Raymond Hettinger. +- Issue #22184: The functools LRU Cache decorator factory now gives an earlier + and clearer error message when the user forgets the required parameters. + - Issue #17923: glob() patterns ending with a slash no longer match non-dirs on AIX. Based on patch by Delhallt. |