[utils] Popen: Shim undocumented text_mode property

Fixes #6317

Authored by: Grub4K
This commit is contained in:
Simon Sawicki 2023-02-23 04:18:45 +01:00 committed by GitHub
parent 18d295c9e0
commit da8e2912b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -879,6 +879,7 @@ def __init__(self, *args, env=None, text=False, **kwargs):
env = os.environ.copy()
self._fix_pyinstaller_ld_path(env)
self.__text_mode = kwargs.get('encoding') or kwargs.get('errors') or text or kwargs.get('universal_newlines')
if text is True:
kwargs['universal_newlines'] = True # For 3.6 compatibility
kwargs.setdefault('encoding', 'utf-8')
@ -900,7 +901,7 @@ def kill(self, *, timeout=0):
@classmethod
def run(cls, *args, timeout=None, **kwargs):
with cls(*args, **kwargs) as proc:
default = '' if proc.text_mode else b''
default = '' if proc.__text_mode else b''
stdout, stderr = proc.communicate_or_kill(timeout=timeout)
return stdout or default, stderr or default, proc.returncode