mirror of
https://github.com/python/cpython.git
synced 2025-07-31 23:23:11 +00:00
Issue #8438: Remove reference to the missing "surrogateescape" encoding
error handler from the new IO library.
This commit is contained in:
parent
35b76027f9
commit
7c587bf53d
4 changed files with 30 additions and 6 deletions
|
@ -19,11 +19,12 @@ def python_exit_code(*args):
|
|||
return subprocess.call(cmd_line, stdout=devnull,
|
||||
stderr=subprocess.STDOUT)
|
||||
|
||||
def spawn_python(*args):
|
||||
def spawn_python(*args, **kwargs):
|
||||
cmd_line = [sys.executable, '-E']
|
||||
cmd_line.extend(args)
|
||||
return subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
||||
**kwargs)
|
||||
|
||||
def kill_python(p):
|
||||
p.stdin.close()
|
||||
|
@ -35,11 +36,11 @@ def kill_python(p):
|
|||
subprocess._cleanup()
|
||||
return data
|
||||
|
||||
def run_python(*args):
|
||||
def run_python(*args, **kwargs):
|
||||
if __debug__:
|
||||
p = spawn_python(*args)
|
||||
p = spawn_python(*args, **kwargs)
|
||||
else:
|
||||
p = spawn_python('-O', *args)
|
||||
p = spawn_python('-O', *args, **kwargs)
|
||||
stdout_data = kill_python(p)
|
||||
return p.wait(), stdout_data
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue