Skip to content

fix: safe_repr for cyrillic #79

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
untitaker merged 5 commits into from
Sep 25, 2018
Merged

fix: safe_repr for cyrillic #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db87782
fix: safe_repr for cyrillic
untitaker Sep 25, 2018
dc3ca41
Merge remote-tracking branch 'origin/master' into fix/safe-repr-cyrillic
untitaker Sep 25, 2018
25419cd
fix: Coding hint for Py2
untitaker Sep 25, 2018
c25c95c
fix: Fix another py2 issue
untitaker Sep 25, 2018
d2b3bf1
fix: remove unused import
untitaker Sep 25, 2018
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
16 changes: 15 additions & 1 deletion sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,25 @@ def safe_repr(value):
rv = repr(value)
if isinstance(rv, bytes):
rv = rv.decode("utf-8", "replace")

# At this point `rv` contains a bunch of literal escape codes, like
# this (exaggerated example):
#
# u"\\x2f"
#
# But we want to show this string as:
#
# u"/"
try:
return rv.encode("utf-8").decode("unicode-escape")
# unicode-escape does this job, but can only decode latin1. So we
# attempt to encode in latin1.
return rv.encode("latin1").decode("unicode-escape")
except Exception:
# Since usually strings aren't latin1 this can break. In those
# cases we just give up.
return rv
except Exception:
# If e.g. the call to `repr` already fails
return u"<broken repr>"


Expand Down
14 changes: 4 additions & 10 deletions tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# coding: utf-8
import sys
import os

from hypothesis import given, assume
from hypothesis import given
import hypothesis.strategies as st

from sentry_sdk.utils import safe_repr, exceptions_from_error_tuple
Expand All @@ -17,15 +18,8 @@ def test_safe_repr_never_broken_for_strings(x):
assert u"broken repr" not in r


@given(x=any_string)
def test_safe_repr_never_leaves_escapes_in(x):
if isinstance(x, bytes):
assume(b"\\u" not in x and b"\\x" not in x)
else:
assume(u"\\u" not in x and u"\\x" not in x)
r = safe_repr(x)
assert isinstance(r, text_type)
assert u"\\u" not in r and u"\\x" not in r
def test_safe_repr_regressions():
assert u"лошадь" in safe_repr(u"лошадь")


def test_abs_path():
Expand Down