From c3fd0f27813b8f55f0627b6b712e0663df333e0f Mon Sep 17 00:00:00 2001 From: Marek Marecki Date: Tue, 3 May 2016 20:42:30 +0200 Subject: [PATCH 1/2] Fix: handling regex characters in path patterns Before this commit if a regex-special character was present on the commandline as a part of path pattern autojump would fail with `sre_constants.error`. --- bin/autojump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index 5595d14..61c43bd 100755 --- a/bin/autojump +++ b/bin/autojump @@ -279,7 +279,7 @@ def match_consecutive(needles, haystack, ignore_case=False): regex_no_sep_end = regex_no_sep + '$' regex_one_sep = regex_no_sep + sep + regex_no_sep # can't use compiled regex because of flags - regex_needle = regex_one_sep.join(needles).replace('\\', '\\\\') + regex_no_sep_end # noqa + regex_needle = regex_one_sep.join(map(re.escape, needles)).replace('\\', '\\\\') + regex_no_sep_end # noqa regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE found = lambda entry: re.search( regex_needle, From 9a16e9e848cdac8b86161e3cec35eead123ad6e0 Mon Sep 17 00:00:00 2001 From: Marek Marecki Date: Tue, 3 May 2016 20:45:09 +0200 Subject: [PATCH 2/2] Add Python 3.5 to tests --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1dfb82f..b06031b 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,8 @@ envlist = py27, py32, py33, - py34 + py34, + py35 # ignore missing setup.py skipsdist = True