floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore ascii escaping for python 3.3/3.4

This commit is contained in:
Ronny Pfannschmidt 2017-09-04 21:25:46 +02:00
parent 78a027e128
commit 13eac944ae
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_pytest/compat.py
View File

@ -7,6 +7,7 @@ import inspect
import types import types
import re import re
import functools import functools
import codecs
import py import py
@ -126,6 +127,19 @@ if _PY3:
STRING_TYPES = bytes, str STRING_TYPES = bytes, str
UNICODE_TYPES = str, UNICODE_TYPES = str,
if PY35:
def _bytes_to_ascii(val):
return val.decode('ascii', 'backslashreplace')
else:
def _bytes_to_ascii(val):
if val:
# source: http://goo.gl/bGsnwC
encoded_bytes, _ = codecs.escape_encode(val)
return encoded_bytes.decode('ascii')
else:
# empty bytes crashes codecs.escape_encode (#1087)
return ''
def _ascii_escaped(val): def _ascii_escaped(val):
"""If val is pure ascii, returns it as a str(). Otherwise, escapes """If val is pure ascii, returns it as a str(). Otherwise, escapes
bytes objects into a sequence of escaped bytes: bytes objects into a sequence of escaped bytes:
@ -145,7 +159,7 @@ if _PY3:
""" """
if isinstance(val, bytes): if isinstance(val, bytes):
return val.decode('ascii', 'backslashreplace') return _bytes_to_ascii(val)
else: else:
return val.encode('unicode_escape').decode('ascii') return val.encode('unicode_escape').decode('ascii')
else: else: