floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better fix as replacement for last commit

This commit is contained in:
uweschmitt 2014-08-07 16:56:45 +02:00
parent f7282b84bd
commit 9597d3dafe
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/capture.py
View File

@ -238,9 +238,13 @@ class EncodedFile(object):
self.write(data) self.write(data)
def __getattr__(self, name): def __getattr__(self, name):
if name != "buffer":
return getattr(self.buffer, name) return getattr(self.buffer, name)
def __setattr__(self, dd):
"""default implementation for __setattr__ because unpickling causes infinite
recursion if only __getattr__ is overloaded and __setattr__ is missing"""
self.__dict__ = dd
class MultiCapture(object): class MultiCapture(object):
out = err = in_ = None out = err = in_ = None