Skip to content

utils.escape() raises TypeError for ASCII bytes #39

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
SAY-5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

utils.escape() raises TypeError for ASCII bytes #39

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
5 changes: 1 addition & 4 deletions backlash/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ def escape(s, quote=False):
if not isinstance(s, (str, bytes)):
s = str(s)
if isinstance(s, bytes):
try:
s.decode('ascii')
except Exception:
s = s.decode('utf-8', 'replace')
s = s.decode('utf-8', 'replace')
s = s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
if quote:
s = s.replace('"', "&quot;")
Expand Down
1 change: 1 addition & 0 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ def test_escape_normalizes_values():
assert escape(None) == ''
assert escape(42) == '42'
assert escape(b'pi\xc3\xb9 <b>') == 'pi\u00f9 &lt;b&gt;'
assert escape(b'hello') == 'hello'
assert escape('say "hi"', quote=True) == 'say &quot;hi&quot;'