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

[svn r37751] fix two other places that used capturing 

(although the greenlet fix is not really
related, but i first saw it now on win32)

--HG--
branch : trunk
This commit is contained in:
hpk 2007-02-01 16:58:10 +01:00
parent 3ad6642a49
commit f21df1b455
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/c-extension/greenlet/test_generator.py
View File

@ -1,7 +1,7 @@
import py import py
try: try:
from py.magic import greenlet from py.magic import greenlet
except RuntimeError, e: except (ImportError, RuntimeError), e:
py.test.skip(str(e)) py.test.skip(str(e))

3
py/misc/buildcmodule.py
View File

@ -11,7 +11,6 @@ def make_module_from_c(cfile):
import os, sys, imp import os, sys, imp
from distutils.core import setup from distutils.core import setup
from distutils.extension import Extension from distutils.extension import Extension
import stdoutcapture
debug = 0 debug = 0
#try: #try:
@ -36,7 +35,7 @@ def make_module_from_c(cfile):
if lib.check(): if lib.check():
lib.remove() lib.remove()
c = stdoutcapture.Capture(mixed_out_err = True) c = py.io.StdCaptureFD()
try: try:
try: try:
saved_environ = os.environ.items() saved_environ = os.environ.items()