Merged revisions 82730-82731 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82730 | r.david.murray | 2010-07-09 08:23:21 -0400 (Fri, 09 Jul 2010) | 4 lines

  7846: limit fnmatch pattern cache to _MAXCACHE=100 entries.

  Patch by Andrew Clegg.
........
  r82731 | r.david.murray | 2010-07-09 09:14:03 -0400 (Fri, 09 Jul 2010) | 2 lines

  Fix sort order mistake in Misc/ACKS.
........
This commit is contained in:
R. David Murray 2010-07-09 13:16:26 +00:00
parent 921d30d261
commit ead883a366
4 changed files with 22 additions and 1 deletions

View file

@ -3,7 +3,7 @@
from test import support
import unittest
from fnmatch import fnmatch, fnmatchcase
from fnmatch import fnmatch, fnmatchcase, _MAXCACHE, _cache, _cacheb
class FnmatchTestCase(unittest.TestCase):
@ -55,6 +55,21 @@ class FnmatchTestCase(unittest.TestCase):
self.check_match(b'test\xff', b'te*\xff')
self.check_match(b'foo\nbar', b'foo*')
def test_cache_clearing(self):
# check that caches do not grow too large
# http://bugs.python.org/issue7846
# string pattern cache
for i in range(_MAXCACHE + 1):
fnmatch('foo', '?' * i)
self.assertLessEqual(len(_cache), _MAXCACHE)
# bytes pattern cache
for i in range(_MAXCACHE + 1):
fnmatch(b'foo', b'?' * i)
self.assertLessEqual(len(_cacheb), _MAXCACHE)
def test_main():
support.run_unittest(FnmatchTestCase)