taleinat
/
fuzzysearch
mirror of https://github.com/taleinat/fuzzysearch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed edge-case of broken input handling in find_near_matches()

This commit is contained in:
Tal Einat 2014-05-16 12:00:59 +03:00
parent 8b3467361d
commit 44be967e43
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuzzysearch/__init__.py
View File

@ -68,12 +68,11 @@ def find_near_matches(subsequence, sequence,
# if it is enough to just take into account the maximum Levenshtein # if it is enough to just take into account the maximum Levenshtein
# distance, use find_near_matches_levenshtein() # distance, use find_near_matches_levenshtein()
elif max_l_dist <= min([ elif max_l_dist <= min(
param for param in [ (max_substitutions if max_substitutions is not None else (1 << 29)),
max_substitutions, max_insertions, max_deletions (max_insertions if max_insertions is not None else (1 << 29)),
] (max_deletions if max_deletions is not None else (1 << 29)),
if param is not None ):
]):
return find_near_matches_levenshtein(subsequence, sequence, max_l_dist) return find_near_matches_levenshtein(subsequence, sequence, max_l_dist)
# if none of the special cases above are met, use the most generic version # if none of the special cases above are met, use the most generic version

9
tests/test_find_near_matches.py
View File

@ -107,6 +107,15 @@ class TestFindNearMatches(unittest.TestCase):
) )
self.assertEqual(self.mock_search_exact.call_count, 1) self.assertEqual(self.mock_search_exact.call_count, 1)
def test_all_none_except_max_l_dist(self):
self.mock_find_near_matches_levenshtein.return_value = [42]
self.assertEqual(
find_near_matches('a', 'a', max_l_dist=1),
[42],
)
self.assertEqual(self.mock_find_near_matches_levenshtein.call_count, 1)
def test_levenshtein(self): def test_levenshtein(self):
"""test cases where 0 < max_l_dist <= max(others)""" """test cases where 0 < max_l_dist <= max(others)"""
# in these cases, find_near_matches should call # in these cases, find_near_matches should call