mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4907 from PySimpleGUI/Dev-latest 

Addition of merge_stderr_with_stdout to the execute subprocess and ex…
This commit is contained in:
PySimpleGUI 2021-10-30 17:32:47 -04:00 committed by GitHub
parent d6adad7bfe e6ba6ce62f
commit 0603b06d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PySimpleGUI.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.53.0.8 Unreleased" version = __version__ = "4.53.0.9 Unreleased"
_change_log = """ _change_log = """
Changelog since 4.53.0 released to PyPI on 24-Oct-2021 Changelog since 4.53.0 released to PyPI on 24-Oct-2021
@ -35,6 +35,9 @@ _change_log = """
Ok, Cancel, etc Ok, Cancel, etc
4.53.0.8 4.53.0.8
Added focus_color to TabGroup element Added focus_color to TabGroup element
4.53.0.9
Parameter merge_stderr_with_stdout added to Exec API calls execute_command_subprocess and execute_py_file
Default is TRUE. The advantage is that all output can be received via stdout, in real time
""" """
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -20429,7 +20432,7 @@ These are the functions used to implement the subprocess APIs (Exec APIs) of PyS
''' '''
def execute_command_subprocess(command, *args, wait=False, cwd=None, pipe_output=False): def execute_command_subprocess(command, *args, wait=False, cwd=None, pipe_output=False, merge_stderr_with_stdout=True):
""" """
Runs the specified command as a subprocess. Runs the specified command as a subprocess.
By default the call is non-blocking. By default the call is non-blocking.
@ -20446,9 +20449,12 @@ def execute_command_subprocess(command, *args, wait=False, cwd=None, pipe_output
:type cwd: (str)) :type cwd: (str))
:param pipe_output: If True then output from the subprocess will be piped. You MUST empty the pipe by calling execute_get_results or your subprocess will block until no longer full :param pipe_output: If True then output from the subprocess will be piped. You MUST empty the pipe by calling execute_get_results or your subprocess will block until no longer full
:type pipe_output: (bool) :type pipe_output: (bool)
:param merge_stderr_with_stdout: If True then output from the subprocess stderr will be merged with stdout. The result is ALL output will be on stdout.
:type merge_stderr_with_stdout: (bool)
:return: Popen object :return: Popen object
:rtype: (subprocess.Popen) :rtype: (subprocess.Popen)
""" """
try: try:
if args is not None: if args is not None:
expanded_args = ' '.join(args) expanded_args = ' '.join(args)
@ -20458,6 +20464,9 @@ def execute_command_subprocess(command, *args, wait=False, cwd=None, pipe_output
# print('calling popen with:', command +' '+ expanded_args) # print('calling popen with:', command +' '+ expanded_args)
# sp = subprocess.Popen(command +' '+ expanded_args, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=cwd) # sp = subprocess.Popen(command +' '+ expanded_args, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=cwd)
if pipe_output: if pipe_output:
if merge_stderr_with_stdout:
sp = subprocess.Popen(command + ' ' + expanded_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd)
else:
sp = subprocess.Popen(command + ' ' + expanded_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd) sp = subprocess.Popen(command + ' ' + expanded_args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd)
else: else:
sp = subprocess.Popen(command + ' ' + expanded_args, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=cwd) sp = subprocess.Popen(command + ' ' + expanded_args, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=cwd)
@ -20476,7 +20485,7 @@ def execute_command_subprocess(command, *args, wait=False, cwd=None, pipe_output
return sp return sp
def execute_py_file(pyfile, parms=None, cwd=None, interpreter_command=None, wait=False, pipe_output=False): def execute_py_file(pyfile, parms=None, cwd=None, interpreter_command=None, wait=False, pipe_output=False, merge_stderr_with_stdout=True):
""" """
Executes a Python file. Executes a Python file.
The interpreter to use is chosen based on this priority order: The interpreter to use is chosen based on this priority order:
@ -20495,9 +20504,12 @@ def execute_py_file(pyfile, parms=None, cwd=None, interpreter_command=None, wait
:type wait: (bool) :type wait: (bool)
:param pipe_output: If True then output from the subprocess will be piped. You MUST empty the pipe by calling execute_get_results or your subprocess will block until no longer full :param pipe_output: If True then output from the subprocess will be piped. You MUST empty the pipe by calling execute_get_results or your subprocess will block until no longer full
:type pipe_output: (bool) :type pipe_output: (bool)
:param merge_stderr_with_stdout: If True then output from the subprocess stderr will be merged with stdout. The result is ALL output will be on stdout.
:type merge_stderr_with_stdout: (bool)
:return: Popen object :return: Popen object
:rtype: (subprocess.Popen) | None :rtype: (subprocess.Popen) | None
""" """
if cwd is None: if cwd is None:
# if the specific file is not found (not an absolute path) then assume it's relative to '.' # if the specific file is not found (not an absolute path) then assume it's relative to '.'
if not os.path.exists(pyfile): if not os.path.exists(pyfile):
@ -20513,9 +20525,9 @@ def execute_py_file(pyfile, parms=None, cwd=None, interpreter_command=None, wait
if python_program == '': if python_program == '':
python_program = 'python' if running_windows() else 'python3' python_program = 'python' if running_windows() else 'python3'
if parms is not None and python_program: if parms is not None and python_program:
sp = execute_command_subprocess(python_program, pyfile, parms, wait=wait, cwd=cwd, pipe_output=pipe_output) sp = execute_command_subprocess(python_program, pyfile, parms, wait=wait, cwd=cwd, pipe_output=pipe_output, merge_stderr_with_stdout=merge_stderr_with_stdout)
elif python_program: elif python_program:
sp = execute_command_subprocess(python_program, pyfile, wait=wait, cwd=cwd, pipe_output=pipe_output) sp = execute_command_subprocess(python_program, pyfile, wait=wait, cwd=cwd, pipe_output=pipe_output, merge_stderr_with_stdout=merge_stderr_with_stdout)
else: else:
print('execute_py_file - No interpreter has been configured') print('execute_py_file - No interpreter has been configured')
sp = None sp = None