p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill the str magic of Encodedfile

This commit is contained in:
Ronny Pfannschmidt 2014-01-22 21:03:49 +01:00
parent 5f21abc3a3
commit 0ede968ec0
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/capture.py
View File

@ -400,10 +400,6 @@ class EncodedFile(object):
def write(self, obj): def write(self, obj):
if isinstance(obj, unicode): if isinstance(obj, unicode):
obj = obj.encode(self.encoding) obj = obj.encode(self.encoding)
elif isinstance(obj, str):
pass
else:
obj = str(obj)
self._stream.write(obj) self._stream.write(obj)
def writelines(self, linelist): def writelines(self, linelist):