diff --git a/Lib/pydoc.py b/Lib/pydoc.py index a1a6aad434ddf4..e8820755aa3c4d 100644 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1702,7 +1702,7 @@ def resolve(thing, forceload=0): if object is None: raise ImportError('''\ No Python documentation found for %r. -Use help() to get the interactive help utility. +Use 'help' to get the interactive help utility. Use help(str) for help on the str class.''' % thing) return object, thing else: diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py index 8ff9c99435bb1a..1f780bc8f44ec0 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -665,12 +665,17 @@ def get_platform(): For other non-POSIX platforms, currently just returns :data:`sys.platform`.""" if os.name == 'nt': + # Check for architecture in sys.version first, then fall back to sys.maxsize + # which is reliable even when sys.version is truncated (e.g., clang builds on Windows) if 'amd64' in sys.version.lower(): return 'win-amd64' - if '(arm)' in sys.version.lower(): - return 'win-arm32' + if sys.maxsize > 2**32: + # 64-bit Windows where sys.version may be truncated + return 'win-amd64' if '(arm64)' in sys.version.lower(): return 'win-arm64' + if '(arm)' in sys.version.lower(): + return 'win-arm32' return sys.platform if os.name != "posix" or not hasattr(os, 'uname'):