[py-svn] py-trunk commit 0fb6ef392e34: remove unused args

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Tue Oct 5 17:56:43 CEST 2010


# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <holger at merlinux.eu>
# Date 1286294197 -7200
# Node ID 0fb6ef392e344014ff7a52e41559ae3b6a9072f5
# Parent  b3f1ef016b2dab683b5b248132263d099f79a400
remove unused args

--- a/py/_plugin/pytest_capture.py
+++ b/py/_plugin/pytest_capture.py
@@ -253,7 +253,7 @@ def pytest_funcarg__capsys(request):
     them available successively via a ``capsys.readouterr()`` method
     which returns a ``(out, err)`` tuple of captured snapshot strings.
     """
-    return CaptureFuncarg(request, py.io.StdCapture)
+    return CaptureFuncarg(py.io.StdCapture)
 
 def pytest_funcarg__capfd(request):
     """captures writes to file descriptors 1 and 2 and makes
@@ -264,14 +264,11 @@ def pytest_funcarg__capfd(request):
     """
     if not hasattr(os, 'dup'):
         py.test.skip("capfd funcarg needs os.dup")
-    return CaptureFuncarg(request, py.io.StdCaptureFD)
-
+    return CaptureFuncarg(py.io.StdCaptureFD)
 
 class CaptureFuncarg:
-    def __init__(self, request, captureclass):
-        self._cclass = captureclass
-        self.capture = self._cclass(now=False)
-        #request.addfinalizer(self._finalize)
+    def __init__(self, captureclass):
+        self.capture = captureclass(now=False)
 
     def _start(self):
         self.capture.startall()



More information about the pytest-commit mailing list