Skip to content

Python3: base virtualBuffer: coerce attribute values to a string before escaping for regular expression #9759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelDCurran merged 3 commits into from
Jun 16, 2019
Merged

Python3: base virtualBuffer: coerce attribute values to a string before escaping for regular expression #9759

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdc3e2a
Base virtualBuffer: make sure to coerce values to a string before esc…
michaelDCurran Jun 16, 2019
0f1010a
Actually coerce the string :)
michaelDCurran Jun 16, 2019
5d94631
Correct comment.
michaelDCurran Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/virtualBuffers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class VBufStorage_findMatch_word(str):
# Symbols that must be escaped for a regular expression.
FINDBYATTRIBS_ESCAPE_TABLE.update({(ord(s), u"\\" + s) for s in u"^$.*+?()[]{}|"})
def _prepareForFindByAttributes(attribs):
escape = lambda text: text.translate(FINDBYATTRIBS_ESCAPE_TABLE)
# A lambda that coerces a value to a string and escapes characters suitable for a regular expression.
escape = lambda val: str(val).translate(FINDBYATTRIBS_ESCAPE_TABLE)
reqAttrs = []
regexp = []
if isinstance(attribs, dict):
Expand Down