From 3ba40954007d56b0f0cef251660c127fe6540137 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 3 Feb 2024 18:42:05 +0200 Subject: [PATCH] compat: inline helpers into `ascii_escaped` The helpers don't add much. --- src/_pytest/compat.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index 26a45349a..14717e941 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -177,22 +177,13 @@ _non_printable_ascii_translate_table.update( ) -def _translate_non_printable(s: str) -> str: - return s.translate(_non_printable_ascii_translate_table) - - -def _bytes_to_ascii(val: bytes) -> str: - return val.decode("ascii", "backslashreplace") - - def ascii_escaped(val: bytes | str) -> str: r"""If val is pure ASCII, return it as an str, otherwise, escape bytes objects into a sequence of escaped bytes: b'\xc3\xb4\xc5\xd6' -> r'\xc3\xb4\xc5\xd6' - and escapes unicode objects into a sequence of escaped unicode - ids, e.g.: + and escapes strings into a sequence of escaped unicode ids, e.g.: r'4\nV\U00043efa\x0eMXWB\x1e\u3028\u15fd\xcd\U0007d944' @@ -203,10 +194,10 @@ def ascii_escaped(val: bytes | str) -> str: a UTF-8 string. """ if isinstance(val, bytes): - ret = _bytes_to_ascii(val) + ret = val.decode("ascii", "backslashreplace") else: ret = val.encode("unicode_escape").decode("ascii") - return _translate_non_printable(ret) + return ret.translate(_non_printable_ascii_translate_table) @dataclasses.dataclass