Merge 9a16e9e848 into 61af2bf4c5

8 years ago · f8174aaad7
parent 61af2bf4c5 9a16e9e848
commit f8174aaad7
2 changed files with 3 additions and 2 deletions
--- 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,
--- a/tox.ini
+++ b/tox.ini
@ -4,7 +4,8 @@ envlist =
    py27,
    py32,
    py33,
-    py34
+    py34,
+    py35
 # ignore missing setup.py
 skipsdist = True