diff options
author | Christian Heimes <christian@python.org> | 2021-12-02 09:17:37 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-02 09:17:37 (GMT) |
commit | cb2b3c8d3566ae46b3b8d0718019e1c98484589e (patch) | |
tree | 85280eaa01fe4a7f6ce5fa8e1559ed71377154a9 | |
parent | 226d22ff2d209495621550eb78e81ed4c0fe0152 (diff) | |
download | cpython-cb2b3c8d3566ae46b3b8d0718019e1c98484589e.zip cpython-cb2b3c8d3566ae46b3b8d0718019e1c98484589e.tar.gz cpython-cb2b3c8d3566ae46b3b8d0718019e1c98484589e.tar.bz2 |
bpo-40280: Emscripten has no support for subprocesses (GH-29872)
Fixes ``platform`` and ``help()`` on emscripten.
Signed-off-by: Christian Heimes <christian@python.org>
Automerge-Triggered-By: GH:tiran
-rwxr-xr-x | Lib/platform.py | 10 | ||||
-rwxr-xr-x | Lib/pydoc.py | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 9e9b422..3f3f25a 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -607,7 +607,10 @@ def _syscmd_file(target, default=''): # XXX Others too ? return default - import subprocess + try: + import subprocess + except ImportError: + return default target = _follow_symlinks(target) # "file" output is locale dependent: force the usage of the C locale # to get deterministic behavior. @@ -746,7 +749,10 @@ class _Processor: """ Fall back to `uname -p` """ - import subprocess + try: + import subprocess + except ImportError: + return None try: return subprocess.check_output( ['uname', '-p'], diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 3a2ff21..7d52359 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1556,6 +1556,8 @@ def getpager(): return plainpager if not sys.stdin.isatty() or not sys.stdout.isatty(): return plainpager + if sys.platform == "emscripten": + return plainpager use_pager = os.environ.get('MANPAGER') or os.environ.get('PAGER') if use_pager: if sys.platform == 'win32': # pipes completely broken in Windows |