Skip to content

Commit 3ba4095

Browse files
committed
compat: inline helpers into ascii_escaped
The helpers don't add much.
1 parent 99e8129 commit 3ba4095

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/_pytest/compat.py

+3-12
Original file line numberDiff line numberDiff line change
@@ -177,22 +177,13 @@ def get_default_arg_names(function: Callable[..., Any]) -> tuple[str, ...]:
177177
)
178178

179179

180-
def _translate_non_printable(s: str) -> str:
181-
return s.translate(_non_printable_ascii_translate_table)
182-
183-
184-
def _bytes_to_ascii(val: bytes) -> str:
185-
return val.decode("ascii", "backslashreplace")
186-
187-
188180
def ascii_escaped(val: bytes | str) -> str:
189181
r"""If val is pure ASCII, return it as an str, otherwise, escape
190182
bytes objects into a sequence of escaped bytes:
191183
192184
b'\xc3\xb4\xc5\xd6' -> r'\xc3\xb4\xc5\xd6'
193185
194-
and escapes unicode objects into a sequence of escaped unicode
195-
ids, e.g.:
186+
and escapes strings into a sequence of escaped unicode ids, e.g.:
196187
197188
r'4\nV\U00043efa\x0eMXWB\x1e\u3028\u15fd\xcd\U0007d944'
198189
@@ -203,10 +194,10 @@ def ascii_escaped(val: bytes | str) -> str:
203194
a UTF-8 string.
204195
"""
205196
if isinstance(val, bytes):
206-
ret = _bytes_to_ascii(val)
197+
ret = val.decode("ascii", "backslashreplace")
207198
else:
208199
ret = val.encode("unicode_escape").decode("ascii")
209-
return _translate_non_printable(ret)
200+
return ret.translate(_non_printable_ascii_translate_table)
210201

211202

212203
@dataclasses.dataclass

0 commit comments

Comments
 (0)