diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-06-25 15:21:04 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-06-25 15:21:04 (GMT) |
| commit | d0de3d4cc458b986bce870a5f57b8fe878f370e2 (patch) | |
| tree | 9500bf6d228ec8efec63cb3267c7ff4821e0d080 | |
| parent | 142d0f5e5a11339d74c105668fe394b2d90e20d6 (diff) | |
| parent | 70797194ab678d53bb1c24536354aa1acc4db467 (diff) | |
| download | cpython-d0de3d4cc458b986bce870a5f57b8fe878f370e2.zip cpython-d0de3d4cc458b986bce870a5f57b8fe878f370e2.tar.gz cpython-d0de3d4cc458b986bce870a5f57b8fe878f370e2.tar.bz2 | |
Issue 11802: filecmp cache was growing without bound.
| -rw-r--r-- | Lib/filecmp.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/filecmp.py b/Lib/filecmp.py index e5983cd..f5cea1d 100644 --- a/Lib/filecmp.py +++ b/Lib/filecmp.py @@ -48,11 +48,12 @@ def cmp(f1, f2, shallow=True): if s1[1] != s2[1]: return False - result = _cache.get((f1, f2)) - if result and (s1, s2) == result[:2]: - return result[2] - outcome = _do_cmp(f1, f2) - _cache[f1, f2] = s1, s2, outcome + outcome = _cache.get((f1, f2, s1, s2)) + if outcome is None: + outcome = _do_cmp(f1, f2) + if len(_cache) > 100: # limit the maximum size of the cache + _cache.clear() + _cache[f1, f2, s1, s2] = outcome return outcome def _sig(st): |