Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r88486:45736179ab7e
Date: 2016-11-19 21:18 +0100
http://bitbucket.org/pypy/pypy/changeset/45736179ab7e/
Log: Reapply fix 0867fc01e680
diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -601,7 +601,7 @@
class TerminalRepr:
def __str__(self):
s = self.__unicode__()
- if sys.version_info[0] < 3:
+ if sys.version_info[0] < 3 and isinstance(s, unicode):
s = s.encode('utf-8')
return s
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
