Skip to content

fix: Remove duplicate function #453

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 2 commits into from
Aug 9, 2019
Merged

fix: Remove duplicate function #453

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
890fc85
fix: Remove duplicate function
untitaker Aug 7, 2019
4bba45a
fix: Fix type hints
untitaker Aug 8, 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
41 changes: 24 additions & 17 deletions sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,13 @@ def __init__(self, value, metadata):
self.metadata = metadata


if MYPY:
from typing import TypeVar

T = TypeVar("T")
Annotated = Union[AnnotatedValue, T]


def get_type_name(cls):
# type: (Optional[type]) -> Optional[str]
return getattr(cls, "__qualname__", None) or getattr(cls, "__name__", None)
Expand Down Expand Up @@ -236,22 +243,13 @@ def iter_stacks(tb):
tb_ = tb_.tb_next


def slim_string(value, length=MAX_STRING_LENGTH):
# type: (str, int) -> str
if not value:
return value
if len(value) > length:
return value[: length - 3] + "..."
return value[:length]


def get_lines_from_file(
filename, # type: str
lineno, # type: int
loader=None, # type: Optional[Any]
module=None, # type: Optional[str]
):
# type: (...) -> Tuple[List[str], Optional[str], List[str]]
# type: (...) -> Tuple[List[Annotated[str]], Optional[Annotated[str]], List[Annotated[str]]]
context_lines = 5
source = None
if loader is not None and hasattr(loader, "get_source"):
Expand All @@ -276,11 +274,11 @@ def get_lines_from_file(

try:
pre_context = [
slim_string(line.strip("\r\n")) for line in source[lower_bound:lineno]
strip_string(line.strip("\r\n")) for line in source[lower_bound:lineno]
]
context_line = slim_string(source[lineno].strip("\r\n"))
context_line = strip_string(source[lineno].strip("\r\n"))
post_context = [
slim_string(line.strip("\r\n"))
strip_string(line.strip("\r\n"))
for line in source[(lineno + 1) : upper_bound]
]
return pre_context, context_line, post_context
Expand All @@ -289,8 +287,11 @@ def get_lines_from_file(
return [], None, []


def get_source_context(frame, tb_lineno):
# type: (FrameType, int) -> Tuple[List[str], Optional[str], List[str]]
def get_source_context(
frame, # type: FrameType
tb_lineno, # type: int
):
# type: (...) -> Tuple[List[Annotated[str]], Optional[Annotated[str]], List[Annotated[str]]]
try:
abs_path = frame.f_code.co_filename # type: Optional[str]
except Exception:
Expand Down Expand Up @@ -652,12 +653,18 @@ def _module_in_set(name, set):
return False


def strip_string(value, max_length=512):
# type: (str, int) -> Union[AnnotatedValue, str]
def strip_string(value, max_length=None):
# type: (str, Optional[int]) -> Union[AnnotatedValue, str]
# TODO: read max_length from config
if not value:
return value

if max_length is None:
# This is intentionally not just the default such that one can patch `MAX_STRING_LENGTH` and affect `strip_string`.
max_length = MAX_STRING_LENGTH

length = len(value)

if length > max_length:
return AnnotatedValue(
value=value[: max_length - 3] + u"...",
Expand Down