[svn r57540] merge changes from release branch back
[svn merge -r 57430:HEAD ../release/0.9.x/ .] * cmdline script organisation * execnet windows fixes * documentation updates * test skips also regen setup.py --HG-- branch : trunk
This commit is contained in:
@@ -59,10 +59,6 @@ import sys
|
||||
class Popen2IO:
|
||||
server_stmt = """
|
||||
import os, sys, StringIO
|
||||
if sys.platform == "win32":
|
||||
import msvcrt
|
||||
msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
|
||||
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
|
||||
io = Popen2IO(sys.stdout, sys.stdin)
|
||||
sys.stdout = sys.stderr = StringIO.StringIO()
|
||||
#try:
|
||||
@@ -75,6 +71,11 @@ sys.stdout = sys.stderr = StringIO.StringIO()
|
||||
|
||||
def __init__(self, infile, outfile):
|
||||
self.outfile, self.infile = infile, outfile
|
||||
if sys.platform == "win32":
|
||||
import msvcrt
|
||||
msvcrt.setmode(infile.fileno(), os.O_BINARY)
|
||||
msvcrt.setmode(outfile.fileno(), os.O_BINARY)
|
||||
|
||||
self.readable = self.writeable = True
|
||||
self.lock = thread.allocate_lock()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user