diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2017-05-03 19:04:53 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2017-05-03 19:04:53 -0300 |
| commit | f3b359f5b88946f8ff65e3a5e5cea2cfacce59e6 (patch) | |
| tree | a8c519bff1ce4f43d82f7377df9233b28ec6db05 /_pytest/compat.py | |
| parent | cccb2cc92ba56033ef21c8627bb00debd6575aef (diff) | |
| parent | 3fc917a261c6209080a34d0cf933305828a70d04 (diff) | |
| download | pytest-f3b359f5b88946f8ff65e3a5e5cea2cfacce59e6.tar.gz | |
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
Diffstat (limited to '_pytest/compat.py')
| -rw-r--r-- | _pytest/compat.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/_pytest/compat.py b/_pytest/compat.py index c06e3f4ca..25610b645 100644 --- a/_pytest/compat.py +++ b/_pytest/compat.py @@ -28,6 +28,7 @@ _PY2 = not _PY3 NoneType = type(None) NOTSET = object() +PY35 = sys.version_info[:2] >= (3, 5) PY36 = sys.version_info[:2] >= (3, 6) MODULE_NOT_FOUND_ERROR = 'ModuleNotFoundError' if PY36 else 'ImportError' @@ -250,8 +251,10 @@ else: try: return str(v) except UnicodeError: + if not isinstance(v, unicode): + v = unicode(v) errors = 'replace' - return v.encode('ascii', errors) + return v.encode('utf-8', errors) COLLECT_FAKEMODULE_ATTRIBUTES = ( |