04-support-cyrillic-id.patch 912 B

1234567891011121314151617181920212223242526
  1. --- contrib/python/pytest/py2/_pytest/compat.py (index)
  2. +++ contrib/python/pytest/py2/_pytest/compat.py (working tree)
  3. @@ -243,7 +243,7 @@ if _PY3:
  4. if isinstance(val, bytes):
  5. ret = _bytes_to_ascii(val)
  6. else:
  7. - ret = val.encode("unicode_escape").decode("ascii")
  8. + ret = val
  9. return _translate_non_printable(ret)
  10. @@ -262,11 +262,11 @@ else:
  11. """
  12. if isinstance(val, bytes):
  13. try:
  14. - ret = val.decode("ascii")
  15. + ret = val.decode("utf-8")
  16. except UnicodeDecodeError:
  17. - ret = val.encode("string-escape").decode("ascii")
  18. + ret = val.decode("utf-8", "ignore")
  19. else:
  20. - ret = val.encode("unicode-escape").decode("ascii")
  21. + ret = val.encode("utf-8", "replace").decode("utf-8")
  22. return _translate_non_printable(ret)