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

simplify activate_funcargs

This commit is contained in:
holger krekel 2012-06-03 21:06:43 +02:00
parent 3f17784386
commit 4d77653bb0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_pytest/capture.py
View File

@ -119,16 +119,12 @@ class CaptureManager:
return "", "" return "", ""
def activate_funcargs(self, pyfuncitem): def activate_funcargs(self, pyfuncitem):
if not hasattr(pyfuncitem, 'funcargs'): if hasattr(pyfuncitem, 'funcargs'):
return for name, capfuncarg in pyfuncitem.funcargs.items():
assert not hasattr(self, '_capturing_funcarg') if name in ('capsys', 'capfd'):
capargs = [] assert not hasattr(self, '_capturing_funcarg')
for name, capfuncarg in pyfuncitem.funcargs.items(): self._capturing_funcarg = capfuncarg
if name in ('capsys', 'capfd'): capfuncarg._start()
capargs.append(capfuncarg)
if capargs:
self._capturing_funcarg = capargs[0]
self._capturing_funcarg._start()
def deactivate_funcargs(self): def deactivate_funcargs(self):
capturing_funcarg = getattr(self, '_capturing_funcarg', None) capturing_funcarg = getattr(self, '_capturing_funcarg', None)