summaryrefslogtreecommitdiff
path: root/_pytest/compat.py
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2017-03-29 14:38:14 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2017-03-29 14:43:13 -0300
commit58ac4faf0c6338439f9b8335709a6bc216d7cd1c (patch)
treea5714b8bded60f31cc48a7cbbe56792cc26a12b5 /_pytest/compat.py
parent6cfe08726175471afacd4efa260b5fe673e91bee (diff)
downloadpytest-58ac4faf0c6338439f9b8335709a6bc216d7cd1c.tar.gz
Fix exception formatting while importing test modules
Fix #2336
Diffstat (limited to '_pytest/compat.py')
-rw-r--r--_pytest/compat.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/_pytest/compat.py b/_pytest/compat.py
index d278b89cd..cc2954bff 100644
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -237,5 +237,7 @@ else:
try:
return str(v)
except UnicodeError:
+ if not isinstance(v, unicode):
+ v = unicode(v)
errors = 'replace'
return v.encode('ascii', errors)