Skip to content

Fix unwanted escaping of regex string-constants (SyntaxWarning: invalid escape sequence) #69

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

Open
umgfoin wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix unwanted escaping of regex string-constants (SyntaxWarning: invalid escape sequence) #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cli/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def userFilter(userSpec, autocompleting, *filters):
from sqlalchemy import and_
return and_(True if userSpec is None else
Users.ID == userSpec if userSpec.isdigit() else
Users.username.ilike(userSpec.replace("_", "\_")+("%" if autocompleting else "")), *filters)
Users.username.ilike(userSpec.replace("_", r"\_")+("%" if autocompleting else "")), *filters)


def userCandidates(userSpec, *filters):
Expand Down
2 changes: 1 addition & 1 deletion endpoints/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def userQuery(domainID=None):
expr = request.args["match"]
fields = set(request.args["matchFields"].split(",")) if "matchFields" in request.args else None
isUnicode = any(ord(c) > 127 for c in expr)
matchexpr = tuple("%"+substr.replace("_", "\_")+"%" for substr in expr.split())
matchexpr = tuple("%"+substr.replace("_", r"\_")+"%" for substr in expr.split())
matchables = Users._meta.matchables if fields is None else (m for m in Users._meta.matchables if m.alias in fields)
targets = []
for prop in matchables:
Expand Down
2 changes: 1 addition & 1 deletion tools/DataModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ def automatch(cls, query, expr, fields=None):
"""Add fuzzy matching to query."""
cls._init()
isUnicode = any(ord(c) > 127 for c in expr)
matchexpr = tuple("%"+substr.replace("_", "\_")+"%" for substr in expr.split())
matchexpr = tuple("%"+substr.replace("_", r"\_")+"%" for substr in expr.split())
matchables = cls._meta.matchables if fields is None else (m for m in cls._meta.matchables if m.alias in fields)
targets = []
for prop in matchables:
Expand Down