[py-svn] r37751 - in py/trunk/py: c-extension/greenlet misc

[hpk at codespeak.net]

Author: hpk
Date: Thu Feb  1 16:58:10 2007
New Revision: 37751

Modified:
   py/trunk/py/c-extension/greenlet/test_generator.py
   py/trunk/py/misc/buildcmodule.py
Log:
fix two other places that used capturing
(although the greenlet fix is not really
related, but i first saw it now on win32) 


Modified: py/trunk/py/c-extension/greenlet/test_generator.py
==============================================================================
--- py/trunk/py/c-extension/greenlet/test_generator.py	(original)
+++ py/trunk/py/c-extension/greenlet/test_generator.py	Thu Feb  1 16:58:10 2007
@@ -1,7 +1,7 @@
 import py
 try:
     from py.magic import greenlet
-except RuntimeError, e:
+except (ImportError, RuntimeError), e:
     py.test.skip(str(e))
 
 

Modified: py/trunk/py/misc/buildcmodule.py
==============================================================================
--- py/trunk/py/misc/buildcmodule.py	(original)
+++ py/trunk/py/misc/buildcmodule.py	Thu Feb  1 16:58:10 2007
@@ -11,7 +11,6 @@
     import os, sys, imp
     from distutils.core import setup
     from distutils.extension import Extension
-    import stdoutcapture
     debug = 0
 
     #try:
@@ -36,7 +35,7 @@
     if lib.check():
         lib.remove()
 
-    c = stdoutcapture.Capture(mixed_out_err = True)
+    c = py.io.StdCaptureFD()
     try:
         try:
             saved_environ = os.environ.items()