jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix jython issue, flexibilize sysexec params 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-10-29 23:46:14 +01:00
parent 609776bf26
commit 6a82cdb37f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_py/path/local.py
View File

@ -542,14 +542,15 @@ class LocalPath(FSBase):
raise raise
return mod return mod
def sysexec(self, *argv): def sysexec(self, *argv, **popen_opts):
""" return stdout text from executing a system child process, """ return stdout text from executing a system child process,
where the 'self' path points to executable. where the 'self' path points to executable.
The process is directly invoked and not through a system shell. The process is directly invoked and not through a system shell.
""" """
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
argv = map(str, argv) argv = map(str, argv)
proc = Popen([str(self)] + list(argv), stdout=PIPE, stderr=PIPE) popen_opts['stdout'] = popen_opts['stderr'] = PIPE
proc = Popen([str(self)] + list(argv), **popen_opts)
stdout, stderr = proc.communicate() stdout, stderr = proc.communicate()
ret = proc.wait() ret = proc.wait()
if py.builtin._isbytes(stdout): if py.builtin._isbytes(stdout):

2
testing/path/test_local.py
View File

@ -338,7 +338,7 @@ class TestImport:
def test_pyimport_check_filepath_consistency(self, monkeypatch, tmpdir): def test_pyimport_check_filepath_consistency(self, monkeypatch, tmpdir):
name = 'pointsback123' name = 'pointsback123'
ModuleType = type(py.std.sys) ModuleType = type(py.std.os)
p = tmpdir.ensure(name + '.py') p = tmpdir.ensure(name + '.py')
for ending in ('.pyc', '$py.class', '.pyo'): for ending in ('.pyc', '$py.class', '.pyo'):
mod = ModuleType(name) mod = ModuleType(name)